OSDN Git Service

Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28
authorPaul Stewart <pstew@google.com>
Wed, 20 Jul 2016 00:31:29 +0000 (00:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Jul 2016 00:31:29 +0000 (00:31 +0000)
commit2e85e2ef26f6c3b55341b3f8448ab8b51e50667c
tree31d5ebe297e3c086acdd491b72b97600318be9ce
parentbf4f010a5b255336584908c661e404f9fce9c9d1
parent58555ee891ceea7d64203221af59b2e1570d714b
Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28
am: 58555ee891

Change-Id: I1032efe65d45995a79572f669cddc5a4cf6131d9