tree c93d8c578354ad447bf2871b69cbf5374869651e
parent 6515b03043b22885f6583a136b6abbf6898683c1
parent b59ce01d2c1abf32133c139e123f6717dfb45511
author Jeff Gaston <jeffrygaston@google.com> 1495584066 +0000
committer android-build-merger <android-build-merger@google.com> 1495584066 +0000

Merge remote-tracking branch 'aosp/upstream-pull-525' into master am: 369c1a464f am: f3a4bd65a4 am: b55f07b186
am: b59ce01d2c

Change-Id: I3c476a20363a35f1f740c118cacd4b8e97266b5e