| commit | 8545a8e01266d7e23aa18d9755134d099df7d131 | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Thu Aug 27 14:36:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:36:45 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 1963cc33f9150096a10ce3ebeeb202b0bb58ca41 [diff] | |
| parent | fc301c11c86db0bcf27ff7d7d0dc33e9b08ca36d [diff] |
am e8d44c50: am 76cbf5f3: (-s ours) am 44a7da74: am 2c1b8f9e: Merge changes Ib0530b9d,I981d9fa6,Icc60dd06,I902ba6b4 * commit 'e8d44c50c7d2a37c197400ea0b52449350127864':