| commit | d7b2c5b681fc8216082a04ed8417281febf05f8f | [log] [tgz] |
|---|---|---|
| author | Hsin-Yi Chen <hsinyichen@google.com> | Wed Jul 19 14:16:13 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jul 19 14:16:13 2017 +0000 |
| tree | 0ad121d2cc6a653192714d1b435936a481626d97 | |
| parent | 29e0896b04b8eb726b35846a179060dc9b2d7924 [diff] | |
| parent | c1788ed58c82fe467261160240ab929babdf5f9a [diff] |
resolve merge conflicts of 4798f66 to stage-aosp-master am: ec5d193eff -s ours am: c1788ed58c -s ours Change-Id: I69fd352a4777ed4b8aedb04759a3581535c85bd1