OSDN Git Service

Manually merge commit 'b406ffa' into stage-aosp-master
authorAdrien Schildknecht <adriens@google.com>
Sat, 3 Dec 2016 04:13:11 +0000 (04:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 3 Dec 2016 04:13:11 +0000 (04:13 +0000)
am: 04c55e6ed7

Change-Id: I77bbb46dfd8f49ed96c3f590d719b511eff55aa6


Trivial merge