tree c93d8c578354ad447bf2871b69cbf5374869651e
parent 371076c25f3e68c631ea8803520b5629b1e5ad21
parent f3a4bd65a4e4c9ce4c1014bcb51ef1816fef016e
author Jeff Gaston <jeffrygaston@google.com> 1495583472 +0000
committer android-build-merger <android-build-merger@google.com> 1495583472 +0000

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

Change-Id: I48f46ab181f7a8fe8076d5fcf74a443cdd88df17