OSDN Git Service

Merge branch 'stage-aosp-master' of https://googleplex-android.googlesource.com/_dire...
authorElliott Hughes <enh@google.com>
Fri, 31 Jul 2015 18:01:15 +0000 (18:01 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 31 Jul 2015 18:01:15 +0000 (18:01 +0000)
commitebf2ade8226fe9bcdd4ef6f7560aa329c458d2ea
treef901760c078b4aca36cc24947b1b61294669f01f
parentc548ae756a3131b1a7c9abc387697218837e29d3
parent48c927346086cba14c8e008b8fce42ce6c928196
Merge branch 'stage-aosp-master' of https://googleplex-android.googlesource.com/_direct/platform/art into stage-aosp-master