| commit | 4d912ce38cded939eb420dd9b0987071c0daf84a | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Mon Aug 29 20:44:46 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Aug 29 20:44:46 2016 +0000 |
| tree | 7f31d02aed087a30d5de813b5beed0208ae39dfe | |
| parent | 4e0c2b2ddabe29d5d010c6f06ae15309663f27f2 [diff] | |
| parent | 5b1602d47062b5497d60bfe74ed16acc2393ad7e [diff] |
resolve merge conflicts of 8c3ddab to nyc-mr1-dev-plus-aosp am: 5b1602d470 Change-Id: I13ca68e0666943a4c658b7e2aa6fa757c5f4edc3