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)
commit93722ead069dec7e8e7174ea230edd4bd78abb6c
tree14ceb65e45ab4895db1b1fdfb45bf4dbd96394be
parent32b7443757e3dd715ebeca1551d817fe3682ccd8
parent04c55e6ed7259c5fb0c3d951f4995778feff2a34
Manually merge commit 'b406ffa' into stage-aosp-master
am: 04c55e6ed7

Change-Id: I77bbb46dfd8f49ed96c3f590d719b511eff55aa6