| commit | a639e79c37d1003632b34b4321f75efbf01e3fb5 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Mon Oct 24 22:06:05 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Oct 24 22:06:05 2016 +0000 |
| tree | da4e55ca45a72815dab3dc5a5eba7f4149188347 | |
| parent | 9b506e3996e410feb9a7a19fc70a9f2c5bcd3bca [diff] | |
| parent | 215acfe15d365490a58ae7d2ccfa61457f1079c2 [diff] |
Merge in upstream history as of '0ee94211e95096750ede752acd13b163aa6d5046' with git merge -s ours. This will make future merge easier. am: 215acfe15d Change-Id: I19845a238515ebd7707342c487034dd21aa8e74a