| commit | 2d8076932ce64db3cbc800252b378577fe605162 | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Fri Aug 12 21:40:32 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 12 21:40:32 2016 +0000 |
| tree | 40fe7cbc1df0df52435df17588197b9ccbd9e365 | |
| parent | ff3e47880e8f2a51eaf07d6ea2db04a13f670a3d [diff] | |
| parent | 7d64d30d0dcdb97be921790e2702e5adfe751d92 [diff] |
resolve merge conflicts of 6ae8c7b to stage-aosp-master am: 32d6e5f0eb am: a944197b97 am: 7d64d30d0d Change-Id: I3b8c6f5f07047fedbc549d0fb7958a429506cc2b