tree 3cf8430ecf812aff6c051b6c63b2e55da42e4fc3
parent 44e298902ed87ea500f4c73e254cdbb06329da47
parent aba68721c47efba34ba80a8a81229ad6600cac7a
author Tony Mak <tonymak@google.com> 1505153423 +0000
committer android-build-merger <android-build-merger@google.com> 1505153423 +0000

Merge "resolve merge conflicts of 56a2b529373b to nyc-dev am: d7dcc3e227 am: 34377e0357 am: 68cce397b3 am: 4453c3cda2 am: 79a32d0a8a  -s ours am: 9c358ccbe2  -s ours am: 72bbe1d631  -s ours am: c6d39d47c5  -s ours" into oc-mr1-dev-plus-aosp
am: aba68721c4  -s ours

Change-Id: I7b6ed6f9a7bd87fb8cd31e1b7125823071524b9d