tree 9763285b1a3e7bbac4f48d4c39f83cf078b5a2ad
parent bb4366201fc58b41b8f73321ca388e5b009ad64d
parent a083ba6a4860dfd084408986106bb4e32e176588
author Adrien Schildknecht <adriens@google.com> 1480738388 +0000
committer android-build-merger <android-build-merger@google.com> 1480738388 +0000

Manually merge commit 'bf03f2e' into stage-aosp-master
am: a083ba6a48

Change-Id: I62ac977e4352061f3d3b7aecbf7dcfbc6026d32a