| commit | b01fada1e0497f4270f0218ac67f4c9a0a591e5a | [log] [tgz] |
|---|---|---|
| author | Daniel Erat <derat@google.com> | Thu Jul 09 23:03:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 09 23:03:46 2015 +0000 |
| tree | 64e9068b17d4fac68f441519f055e1057942127c | |
| parent | 013a092fe93c7dfdba667fe93aae45b6ed9ce383 [diff] | |
| parent | de7f8a61ae8c5141262ad00f7ae1e61baa41c59c [diff] |
am de7f8a61: am f0f2aaa9: Merge "Incorporate upstream changes to v1.6.8." * commit 'de7f8a61ae8c5141262ad00f7ae1e61baa41c59c': Incorporate upstream changes to v1.6.8.