tree 14ceb65e45ab4895db1b1fdfb45bf4dbd96394be
parent 32b7443757e3dd715ebeca1551d817fe3682ccd8
parent 04c55e6ed7259c5fb0c3d951f4995778feff2a34
author Adrien Schildknecht <adriens@google.com> 1480738391 +0000
committer android-build-merger <android-build-merger@google.com> 1480738391 +0000

Manually merge commit 'b406ffa' into stage-aosp-master
am: 04c55e6ed7

Change-Id: I77bbb46dfd8f49ed96c3f590d719b511eff55aa6