tree 56d18289b91d8a70a5b3cee9c51a9b4f1d5ca851
parent 8f0de55375716a8fba0459156474daf4a1b9177a
parent b0b6afc248307f0d2eec0e003e47a051a25da093
author The Android Automerger <android-build-merger@google.com> 1472516781 +0000
committer The Android Automerger <android-build-merger@google.com> 1472516781 +0000

Manually merge commit 'b0b6afc' into nyc-dev-plus-aosp