OSDN Git Service

Merge changes I6badcc6a,I652ac746 am: dfc610e672
authorDavid Turner <digit@google.com>
Fri, 17 Jun 2016 07:58:37 +0000 (07:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Jun 2016 07:58:37 +0000 (07:58 +0000)
am: 07e51c3536

Change-Id: I7ef7e559d1219ed2c18110e4bdee80ce3a600f9f


Trivial merge