| commit | 04a8b2b5325b27edf84d505b42c7b97dcdeed315 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Nov 02 15:49:26 2017 -0700 |
| committer | Xin Li <delphij@google.com> | Thu Nov 02 15:49:26 2017 -0700 |
| tree | b44b437db1f3a5ee1b4d31b286d9a4e2e5084db7 | |
| parent | 57e16e4f773e88f65de2fe2c4032468936c6a937 [diff] | |
| parent | 04bcf3ee761d8648d0247dd8322e3542c0319464 [diff] |
Merge commit '04bcf3ee761d8648d0247dd8322e3542c0319464' from oc-mr1-dev-plus-aosp into stage-aosp-master Change-Id: Ie321cc4ce4a2324ca7bf0f3493f23ea7999765b8