OSDN Git Service

Manually merge commit 'b406ffa' into stage-aosp-master am: 04c55e6ed7
authorAdrien Schildknecht <adriens@google.com>
Sat, 3 Dec 2016 04:15:10 +0000 (04:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 3 Dec 2016 04:15:10 +0000 (04:15 +0000)
commit43100e580f288e28940b86faddb0e51695c72269
tree14ceb65e45ab4895db1b1fdfb45bf4dbd96394be
parent6984a92aa966f896f1c496b32664690a378b6960
parent93722ead069dec7e8e7174ea230edd4bd78abb6c
Manually merge commit 'b406ffa' into stage-aosp-master am: 04c55e6ed7
am: 93722ead06

Change-Id: I25c4f8f2f833360b39939360ad400e6ed21fc176