| commit | 43c8ccff5ff9b85f232d3dd400c7d4d648d5761c | [log] [tgz] |
|---|---|---|
| author | Carlos Chinchilla <cachinchilla@google.com> | Thu Dec 07 18:20:38 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 07 18:20:38 2017 +0000 |
| tree | f5ceaced2fd201a1ff8d89244540461b3ea987e1 | |
| parent | 0e62d2ee679d179a52862c559f53d0b4a88cff63 [diff] | |
| parent | a285f3f514f0b9d442ede59ea7558bd269cfaa2c [diff] |
resolve merge conflicts of 17789acdc6 to stage-aosp-oc-mr1-cts-dev am: 6042c9f166 am: bddbc9cc26 -s ours am: a285f3f514 -s ours Change-Id: Ie482ec6cb47fbb9d0b3dc400cd79d9f347d1a6a7