| commit | 21fde4ba3dd709b4b17bdb523093fc13183e8485 | [log] [tgz] |
|---|---|---|
| author | Sameer Padala <sxp@google.com> | Sat Jan 31 02:01:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 31 02:01:11 2015 +0000 |
| tree | 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25 | |
| parent | c3c336766abee6bb780b5f9022fda7db720b5372 [diff] | |
| parent | 632e90bd7c045d14397770dd6bd945295f75cb7b [diff] |
am 632e90bd: am 81b32966: am 056cf62b: Merge "Update code so it compiles on google3" into ub-now-porkchop * commit '632e90bd7c045d14397770dd6bd945295f75cb7b':