tree 2fe73bb68353f2064d8516302a3ece14c5e26581
parent 79cb08e43d788f4eb172facdc62b3f85259bd6be
parent 669716d27c713708cc1b43849fa80a85e7e45ffc
author Adrien Schildknecht <adriens@google.com> 1480738807 +0000
committer android-build-merger <android-build-merger@google.com> 1480738807 +0000

Manually merge commit '61e74d7' into stage-aosp-master am: 9f9a239ca3 am: aec7316546
am: 669716d27c

Change-Id: I75f9c115fe178008174f1fea8cb8b890b83c2543