| commit | eb0fde522eec59391f8e5a0e2ac6a276b9bccd52 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Nov 03 09:18:42 2017 -0700 |
| committer | Xin Li <delphij@google.com> | Tue Nov 07 09:56:22 2017 -0800 |
| tree | 7e12bdc7f87bac9c50a6aaf14eefe0f1358f1e4c | |
| parent | dec2953e85b6d77e42cbfdcdb404f33ca5d06698 [diff] | |
| parent | 43bb71da96cfcd55d8b346d526546939a157af78 [diff] |
DO NOT MERGE Merge commit '43bb71da96cfcd55d8b346d526546939a157af78' from oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master Change-Id: Idb8d59b29751aaedfb6e25ec33ca00660d239fa6