tree d5e6e86c37b92ae415107d88fc4789acf79a58c0
parent 0b1d93b14b3d4cceeb440b9ccd0a45b292efc10c
parent 43100e580f288e28940b86faddb0e51695c72269
author Adrien Schildknecht <adriens@google.com> 1480738813 +0000
committer android-build-merger <android-build-merger@google.com> 1480738813 +0000

Manually merge commit 'b406ffa' into stage-aosp-master am: 04c55e6ed7 am: 93722ead06
am: 43100e580f

Change-Id: I8a74fd730f0aa5a1f94c04c12286e96ac299b463