tree 743116789dbc28e50ff225c0e961cee040b550a4
parent 414cd0d73e00828eaf3a087ab0b6cd52947143e2
parent c6625a71e4a889b34dc335a290efd599056bc2b0
author David Gross <dgross@google.com> 1529434598 -0700
committer android-build-merger <android-build-merger@google.com> 1529434598 -0700

resolve merge conflicts of ad2db12b3a6d1cd72b50a09ae19164e9815eb219 to stage-aosp-master
am: c6625a71e4

Change-Id: Ifc27124c9d5e408a2eb3cefe8d49c673df15d68c