| commit | 9e509a32e231cc4d4d683cf0974e99270321c012 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Thu Aug 27 13:12:01 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 13:12:01 2015 +0000 |
| tree | 2b9df2f1d0592d32e2f185d27c070ac5de011ec7 | |
| parent | 1e18c60a2cea527583a77e3e2ed8335f507876b1 [diff] | |
| parent | c9c129c8d0c78c092681efc92b8f2d6dd01d2b40 [diff] |
am c9c129c8: am 3b2c6065: (-s ours) am 07f4f423: Merge changes Icdc56a50,I63d5dc28,Ia7d0c5d8,I47406533 * commit 'c9c129c8d0c78c092681efc92b8f2d6dd01d2b40':