| commit | a5fba8c5778f6095eee47ad5bc22ce19b02c685a | [log] [tgz] |
|---|---|---|
| author | Yuexi Ma <yuexima@google.com> | Thu Jan 25 22:13:41 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jan 25 22:13:41 2018 +0000 |
| tree | 141c31cdf0b55ef108c4c7c9b8b963f135a81dc1 | |
| parent | c7891a75b3bc868b84644d032fa308378be587a5 [diff] | |
| parent | 1a1653751805ad90b6cacddbde385ff7fdb035b2 [diff] |
Merge "resolve merge conflicts of 9ef7b1199bec7a109d2fcaaaac66e8a8994570cf to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp am: 1a16537518 Change-Id: I53826b29e8e763c1be763d8bd828dbb00c3d3dc6