OSDN Git Service

Merge changes I2198f8b5,I245c859e
authorMark Salyzyn <salyzyn@google.com>
Tue, 29 Nov 2016 17:50:14 +0000 (17:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 29 Nov 2016 17:50:14 +0000 (17:50 +0000)
commitaf3938ae347dbb180ca5a915b512879ab04e2c41
tree379aa540f68fd8827470e6689dce53a2788081a2
parent0ceab28690a2fdc85b0e0e5b1b93da30016f1f44
parentc3fbd8b936f1efa582be456df9b5d953b9e101fc
Merge changes I2198f8b5,I245c859e
am: c3fbd8b936

Change-Id: I8a765ad6d12ea8450fba6f229e564b0a40007c15