| commit | 996b6daac844bd1caf465fee565eda12ba75aee0 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Nov 09 01:08:11 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Nov 09 01:08:11 2017 +0000 |
| tree | e0ddd87bd9d323d7987194bcb89c8277d7aecf55 | |
| parent | 27a24d06af6e1fc0931acd48b4b992e2f0f30f61 [diff] | |
| parent | 9eb066973fdf6c48ccd3fbb80e37bc21ba7bf20b [diff] |
resolve merge conflicts of 01270df to oc-mr1-dev-plus-aosp am: 9eb066973f Change-Id: I1fd068e9f996ab44a6e1a9fc334b45d77f56d5e8