| commit | 6213eaeced624abd3e3a6a65ed69458bbf34b82f | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Oct 24 22:13:06 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Oct 24 22:13:06 2016 +0000 |
| tree | da4e55ca45a72815dab3dc5a5eba7f4149188347 | |
| parent | 9b506e3996e410feb9a7a19fc70a9f2c5bcd3bca [diff] | |
| parent | c590c72c39c09c5bde7d22c75f4062aedc761ac8 [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 Change-Id: I2b734b091e95e5e3ebae76325d29f817d5b85e9a