| commit | af79b43115ea73e0dc6700d6ad39fb170547666b | [log] [tgz] |
|---|---|---|
| author | Xin Li <[email protected]> | Mon Oct 24 22:17:06 2016 +0000 |
| committer | android-build-merger <[email protected]> | Mon Oct 24 22:17:06 2016 +0000 |
| tree | da4e55ca45a72815dab3dc5a5eba7f4149188347 | |
| parent | e7c9bbfc184bcfef4596af78e0716b50b529a218 [diff] | |
| parent | 6213eaeced624abd3e3a6a65ed69458bbf34b82f [diff] |
Merge in upstream history as of '0ee94211e95096750ede752acd13b163aa6d5046' with git merge -s ours. This will make future merge easier. am: 215acfe15d am: a639e79c37 am: c590c72c39 am: 6213eaeced Change-Id: I3750e2b1dc57c180f9e6ceb07956d61fab3e153a