| commit | 2cf1dbd64a4fef04e0c0f26d55a3f366f6e9cfa9 | [log] [tgz] |
|---|---|---|
| author | Chris Thornton <thorntonc@google.com> | Fri Jun 12 00:39:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 12 00:39:29 2015 +0000 |
| tree | 9430e61c12a16518b5ffd51127df14c649c8f350 | |
| parent | 14831335168802edd67a99faeb3184447c2e0141 [diff] | |
| parent | fe6aac07f00f9aeca5121a2840ac0fb1a4d7e960 [diff] |
Merge branch 'mnc-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/art into mnc-dev-plus-aosp