OSDN Git Service

Merge changes I852b4daf,Id648eaed
authorAlex Light <allight@google.com>
Fri, 12 Aug 2016 17:42:32 +0000 (17:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 12 Aug 2016 17:42:32 +0000 (17:42 +0000)
commit4610ec68b5a9639ef84d6bba5eebb61ae07cfbfe
treea40a151d39cc8cb0a5ea7286e5e6991759911b38
parentd8452dbf57c723641992ac89ec5bf88d58fcaf2b
parent346285b55869af2054465fccef2065f7462ac9cd
Merge changes I852b4daf,Id648eaed
am: 346285b558

Change-Id: Id1c7bc956e0c64620a030edd72a3a8bb3831a712