| commit | 632e90bd7c045d14397770dd6bd945295f75cb7b | [log] [tgz] |
|---|---|---|
| author | Sameer Padala <sxp@google.com> | Sat Jan 31 01:07:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 31 01:07:30 2015 +0000 |
| tree | 10da860fcff71886af91d082e31f0e1917926848 | |
| parent | 585273e28f02c479f077367e0b9122996e2b1161 [diff] | |
| parent | 81b32966205e242f9470137caf829aaa8c45e19d [diff] |
am 81b32966: am 056cf62b: Merge "Update code so it compiles on google3" into ub-now-porkchop * commit '81b32966205e242f9470137caf829aaa8c45e19d':