| commit | c9c129c8d0c78c092681efc92b8f2d6dd01d2b40 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Thu Aug 27 05:10:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:10:38 2015 +0000 |
| tree | 2b9df2f1d0592d32e2f185d27c070ac5de011ec7 | |
| parent | 49f90caedae40985d7a447ed704e25f35a83bdcc [diff] | |
| parent | 3b2c60656d36f47063e972b9aa2c11ef235253a6 [diff] |
am 3b2c6065: (-s ours) am 07f4f423: Merge changes Icdc56a50,I63d5dc28,Ia7d0c5d8,I47406533 * commit '3b2c60656d36f47063e972b9aa2c11ef235253a6':