tree c504bb11f1425b3679d93f015b84cd8536251287
parent aec3a4203f04df70fd3ef90a3b70bac31b2dce12
parent d5ab575b01ebc980c2e6054647e133cb47dc4081
author Andrew Hayden <andrewhayden@google.com> 1467994015 +0000
committer android-build-merger <android-build-merger@google.com> 1467994015 +0000

Sync to 8ffe39d965862e3659c68208efa9147adcaea3bb.
am: d5ab575b01

Change-Id: Id2d93fe021efe03006191d851f0492fbd9b09ec7