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)
am: 93722ead06

Change-Id: I25c4f8f2f833360b39939360ad400e6ed21fc176


Trivial merge