| commit | 28d63373a8629cf6651cacc90710f931aa940fdd | [log] [tgz] |
|---|---|---|
| author | Bowgo Tsai <bowgotsai@google.com> | Sat Sep 30 01:17:08 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Sep 30 01:17:08 2017 +0000 |
| tree | dbe82f753ff5d36f398a69cbc4c50a2cac71b9d0 | |
| parent | 2aa0fee969ba301a99ba2409e8823a42ec24e1a4 [diff] | |
| parent | c4ccbd7b2d69930a399ce5f66c54b2fc080d37db [diff] |
Merge "resolve merge conflicts of 73d9596bc to oc-mr1-dev-plus-aosp" into oc-mr1-dev-plus-aosp am: 773ebbdfe3 Change-Id: I30f2dd7ecb6388ae225ce534598e2bdfbda08518