OSDN Git Service

Merge changes I28f7ac47,If075675e into oc-dev am: 4f5c38b357
authorWinson Chung <winsonc@google.com>
Fri, 19 May 2017 19:35:48 +0000 (19:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 May 2017 19:35:48 +0000 (19:35 +0000)
commit41dbf5adab1eaf84e20dbf7d09fc49000fe44cb1
treee758d7fd584059bbc0ba70a0a41f058a83a34273
parentce38b43ffd30c1b20c73dc819528a4da2ac73614
parent97fb03ca2f87a3fcdad7d193ed0455886a6bc85d
Merge changes I28f7ac47,If075675e into oc-dev am: 4f5c38b357
am: 97fb03ca2f

Change-Id: I7fb14effb541dc5329e25a1fd026ad1372346f98