| commit | 81b32966205e242f9470137caf829aaa8c45e19d | [log] [tgz] |
|---|---|---|
| author | Sameer Padala <sxp@google.com> | Mon Aug 11 19:55:59 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 11 19:55:59 2014 +0000 |
| tree | a5515f4a76d983bfb1ebb6577f1bebb64f45ff6f | |
| parent | a027e9c746ecbfb6ae16e4a1fb4ac8745f44906f [diff] | |
| parent | 056cf62bbb0edc46199b3791861caf4249da3ed5 [diff] |
am 056cf62b: Merge "Update code so it compiles on google3" into ub-now-porkchop * commit '056cf62bbb0edc46199b3791861caf4249da3ed5': Update code so it compiles on google3