| commit | 26ce593c1ee8d82655859b84d6691c7260495184 | [log] [tgz] |
|---|---|---|
| author | sqian <shuoq@google.com> | Tue Jul 18 23:57:59 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 18 23:57:59 2017 +0000 |
| tree | d5abd73f978a4c5e50a752b975ce2bc6c1af246c | |
| parent | d640e70bb5ccaf9c98937641a01246181edaa92f [diff] | |
| parent | c278e0ae17845651a74ca143e7f42f8c75612336 [diff] |
resolve merge conflicts of 6ecc54a7 to stage-aosp-master am: 227fe277bf am: c278e0ae17 -s ours Change-Id: I5286e807f04a839eeb5fbcddf8a278354979b58a