tree c504bb11f1425b3679d93f015b84cd8536251287
parent 709623d3f11212b115c7c85569febd6472c3aeaf
parent 5a1c799c43d3c17f95cfe173752a231be2049e16
author Andrew Hayden <andrewhayden@google.com> 1467994239 +0000
committer android-build-merger <android-build-merger@google.com> 1467994239 +0000

Sync to 8ffe39d965862e3659c68208efa9147adcaea3bb. am: d5ab575b01
am: 5a1c799c43

Change-Id: I51b2256e6f74a2e66f4fdb99e92dbbc9e0b91ed8