| commit | 4994440faf5924da9987bb8f30b1193f3d8090be | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Nov 14 14:24:07 2017 -0800 |
| committer | Xin Li <delphij@google.com> | Tue Nov 14 14:24:07 2017 -0800 |
| tree | 5e609b3f0ab4d831641f82896f532d97ddc9dc1a | |
| parent | c8ec93afd36ced43e0702f87f8ac1a5e4de36cf1 [diff] | |
| parent | 2fc42a279697a847d5b6961914f6f6afbed49a48 [diff] |
Merge commit '2fc42a279697a847d5b6961914f6f6afbed49a48' from oc-mr1-dev-plus-aosp into stage-aosp-master. Change-Id: I754fe8c1ec11f047e58694a2fdc8d9ab1b85cab5