| commit | eedde385b9209539573f7c49d5ccb1e30e96c113 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Nov 10 14:39:24 2017 -0800 |
| committer | Xin Li <delphij@google.com> | Fri Nov 10 14:39:24 2017 -0800 |
| tree | 5d8dc9bbab31b24bba4a7fb993d4d178ba455c82 | |
| parent | ce603202f7d606228f502d8b2964f1b39da00ee3 [diff] | |
| parent | 8123e36f13fd6acc122c04ddadd2f676408ec10a [diff] |
Merge commit '8123e36f13fd6acc122c04ddadd2f676408ec10a' from oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master. Change-Id: I55c4a4a736e1cdbfd579bd0529ed8d8966eb9e2a