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