| commit | e3196fd301a28e885b2337fcaf1611eb95fefbdd | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Wed Nov 15 02:39:52 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 15 02:39:52 2017 +0000 |
| tree | fc358d4ab4b77f25f5d93537f9f27a537e5fdf55 | |
| parent | b9a21ca4cb848dd26a840ab680a60901f0983385 [diff] | |
| parent | 9cd8862add94df1c0b6a0ff76fbd463a79c3cb29 [diff] |
Merge commit '98e12851336b7db16e583f9afac63ecc97465980' from oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master. am: 220871a697 -s ours am: 2436ec217c -s ours Change-Id: Idfc0b2349f7475089373c8fdceebe7f166a5cd37