| commit | c278e0ae17845651a74ca143e7f42f8c75612336 | [log] [tgz] |
|---|---|---|
| author | sqian <shuoq@google.com> | Tue Jul 18 23:49:18 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 18 23:49:18 2017 +0000 |
| tree | 537d36c950ac78b54c6cb931671f5a606e24fd23 | |
| parent | dbd472dca9ea73cdb29c59c10e2936707e4c9b71 [diff] | |
| parent | 227fe277bfc62a2e138744a35ba1db411e998e99 [diff] |
resolve merge conflicts of 6ecc54a7 to stage-aosp-master am: 227fe277bf Change-Id: I4a0785f4bc32631a9f5f87783e4ace4fa58daf6a