| commit | 1fee7f2280284db15abc8a46d13f2c1e39eee272 | [log] [tgz] |
|---|---|---|
| author | SzuWei Lin <szuweilin@google.com> | Thu May 04 07:14:41 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 04 07:14:41 2017 +0000 |
| tree | 1892093d39775f7d0dcc0dcf7ff8f3d36290ed58 | |
| parent | b7ec103fa3b4a7ad16ece4b0ed11414a8c68e77e [diff] | |
| parent | be02841e8215d93a780849ad9e797cbbe602dcd7 [diff] |
resolve merge conflicts of 88874349da to oc-dev-plus-aosp am: be02841e82 Change-Id: Ib151418d317b0f5a87aebaa2b5bbdd9ab9744996