| commit | b82465849450a54820758161fefe05cf61ea960f | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Thu Dec 22 19:01:13 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 22 19:01:13 2016 +0000 |
| tree | ad71b3858ffc86341b71a35ffdfc517105e00da0 | |
| parent | 8dc64b729b3005660c06006a1f60b873d5181ccd [diff] | |
| parent | 5c53fdb89367481c2a65d7c8d188415c8e485131 [diff] |
resolve merge conflicts of febd982 to stage-aosp-master am: 5c53fdb893 Change-Id: Ib0878f0f17c3799ff9ffb92d7e85904fc91fdab7