| commit | 45574b17b4443c13f70c7c62b2bcb0c0ef2969d4 | [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 | e45bf40318808b7ce83e3536c7e351d1021dc635 | |
| parent | 091e23fb0c93886b83335fac9596330a4ae06804 [diff] | |
| parent | 456a25e50b2fa4c85f14b74801edf6d84b650b20 [diff] |
Merge commit '456a25e50b2fa4c85f14b74801edf6d84b650b20' from oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master. Change-Id: I55c4a4a736e1cdbfd579bd0529ed8d8966eb9e2a