| commit | 8e01dd035a6b67b86672711e7daaf4342979ccd4 | [log] [tgz] |
|---|---|---|
| author | Sameer Padala <sxp@google.com> | Sat Jan 31 06:21:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 31 06:21:24 2015 +0000 |
| tree | c028bfe537607823c37e2ffc8c713c73059d3130 | |
| parent | 4776ba64430d93678906069afc3a83fe6f51a96c [diff] | |
| parent | 21fde4ba3dd709b4b17bdb523093fc13183e8485 [diff] |
am 21fde4ba: am 632e90bd: am 81b32966: am 056cf62b: Merge "Update code so it compiles on google3" into ub-now-porkchop * commit '21fde4ba3dd709b4b17bdb523093fc13183e8485':