tree 0ac144b316ed2b3cf149ffec3a6c3fc3ca1f591b
parent df42e41f0e5c0dd16589876204b6fbedf1660203
parent 426d48b6a34c2f6962eff02d3e404ff19bc217bb
author Brad Ebinger <breadley@google.com> 1489700049 +0000
committer android-build-merger <android-build-merger@google.com> 1489700049 +0000

resolve merge conflicts of 7dc6b68 to stage-aosp-master am: b133a5bf72
am: 426d48b6a3

Change-Id: Ic4c6e9a84a004de2ae59aa970f742095164cbdd7