| commit | 1473fb0dd684e8134a69b887dc5017848ddc8ba9 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Nov 02 22:22:39 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Nov 02 22:22:39 2017 +0000 |
| tree | 1382a6da9298f8a168bf49b9117b2a4eb78f2c69 | |
| parent | 01674e16c6960096586ef6872d50e9f83d585338 [diff] | |
| parent | 8c9f1120f085a58cc1c4ca549b79659c781c357c [diff] |
Merge commit '6d0253779d72fd2f5d16ac1e6e52f6b4c0535ff4' from oc-mr1-dev-plus-aosp into stage-aosp-master. am: c4e7d852f5 am: 8c9f1120f0 Change-Id: I0a4cac1f5ebb58decf8148904b81fe6555f49c8d