tree f2831f4e44b384f7047628cbcd833f1dcb346f52
parent 21e0e88b173e6bf08e9224fa35f21d486a77a5ad
parent 6f30a3a1fedeb43afdb303e72a9aba8d1e2017cf
author Android Build Merger (Role) <android-build-merger@google.com> 1468985445 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1468985447 +0000

Merge "Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26 am: c92e93c47b am: bb7439d8a1 am: 0f9a968c0e am: 1e9889d5ac am: a09b6ee165 am: 2331eefef7 am: a20314a28e am: a71fe00594 am: 9fd8d75ebc" into nyc-mr1-dev-plus-aosp