| commit | cdd1dfd23e9976536e2dad103b6c357927fca27d | [log] [tgz] |
|---|---|---|
| author | Andy Hung <hunga@google.com> | Tue Sep 22 20:58:06 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 20:58:06 2015 +0000 |
| tree | 9cd2a666e3d0aae09cf5ab6b27b34177aa7ce12e | |
| parent | 71d7a944b5a26787c94e32f652245b61c606c485 [diff] | |
| parent | 500d282a4155f91f09049a6a0ba11d5bbc6cc02d [diff] |
am 500d282a: (-s ours) am 5faeb8bc: am 3916845d: am 71a9b324: am e22f5f49: (-s ours) DO NOT MERGE - Fix build for commit 69ae6a87 * commit '500d282a4155f91f09049a6a0ba11d5bbc6cc02d': DO NOT MERGE - Fix build for commit 69ae6a87