| commit | f6b2c113df7588af368eba43ff4024fd8736c0fb | [log] [tgz] |
|---|---|---|
| author | sqian <shuoq@google.com> | Tue Aug 15 19:07:36 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 15 19:07:36 2017 +0000 |
| tree | 5a94a6309ce2b9b5d0478083906ce5b149ea9e12 | |
| parent | c61088583f9592b45b09ddef78300627ce70a3e4 [diff] | |
| parent | a748e8e17ef8609e266d14e4257ceded5c57a125 [diff] |
resolve merge conflicts of 3ceaacc to stage-aosp-master am: 04b63e5ab2 am: 396aadae6f -s ours am: a748e8e17e -s ours Change-Id: I588dbb17c9c8af53aa26419f64f4c9e17e567305