| commit | ebf2ade8226fe9bcdd4ef6f7560aa329c458d2ea | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Jul 31 18:01:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 31 18:01:15 2015 +0000 |
| tree | f901760c078b4aca36cc24947b1b61294669f01f | |
| parent | c548ae756a3131b1a7c9abc387697218837e29d3 [diff] | |
| parent | 48c927346086cba14c8e008b8fce42ce6c928196 [diff] |
Merge branch 'stage-aosp-master' of https://googleplex-android.googlesource.com/_direct/platform/art into stage-aosp-master