tree b78a7f4fad7b2d1b2989bf54e02694287dd4c35f
parent d617066fb6048ef15f47f58a241fa8399845e831
parent 8e7552aae7305cabda37656801b891f4ff435bf5
author Colin Cross <ccross@android.com> 1515010327 +0000
committer android-build-merger <android-build-merger@google.com> 1515010327 +0000

Revert "Merge remote-tracking branch 'aosp/upstream-pull-525' into master" am: 37043f9e86
am: 8e7552aae7

Change-Id: I2fcdfd5240ed833c7910b2e4810a9d24b2aa8772