OSDN Git Service

Merge changes I28f7ac47,If075675e into oc-dev
authorWinson Chung <winsonc@google.com>
Fri, 19 May 2017 19:28:15 +0000 (19:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 May 2017 19:28:15 +0000 (19:28 +0000)
commit97fb03ca2f87a3fcdad7d193ed0455886a6bc85d
tree649bb46fc4e57a83fa7fbd108910dd237273b009
parentd6066c83cac6cd843cacb391a178eff97f2e4d41
parent4f5c38b3574246f8dfe55c9ee2c1955faedc6a10
Merge changes I28f7ac47,If075675e into oc-dev
am: 4f5c38b357

Change-Id: I21d7ad41247bf36fdc7209dbe6f2b26a86cdd26b