OSDN Git Service

Manually merge commit '398e284' into stage-aosp-master am: e591ad15a0 am: f39613a549
authorJin Qian <jinqian@google.com>
Sat, 3 Dec 2016 04:19:58 +0000 (04:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 3 Dec 2016 04:19:58 +0000 (04:19 +0000)
commit0315cb564b458721728e0afc5d75cfe146a54493
tree613dad301ee6463a481313ad3e5f8dfb707134a3
parentdff44388f0648cb452896644c0de0505006ab531
parent24ee1d285ecf41ae3e980efc4f42b1efda31767e
Manually merge commit '398e284' into stage-aosp-master am: e591ad15a0 am: f39613a549
am: 24ee1d285e

Change-Id: I96e75e1cb394d2356fda0d6faf1b5e9962094ef8