OSDN Git Service

Merge changes I2107c355,I60b5e161 into nyc-mr1-dev-plus-aosp
authorJason Monk <jmonk@google.com>
Mon, 25 Jul 2016 22:58:43 +0000 (22:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Jul 2016 22:58:43 +0000 (22:58 +0000)
commit12dfccc8c333b09b76464a7c1d260ef4132807a4
treed0c62bef74c1eca07efd8cfe779026fc3375e541
parent98ac4b35ef08cff6ca21b2fa3463c603f92a6b4e
parent8db381c0a0b5abb85f864b2a41033013c993071b
Merge changes I2107c355,I60b5e161 into nyc-mr1-dev-plus-aosp
am: 8db381c0a0

Change-Id: Ia890077286aa752b237739573efc865136fe1b89