| commit | b7e7e0e49a013f75abfa59d80add625adcd7c7f7 | [log] [tgz] |
|---|---|---|
| author | Andre Eisenbach <eisenbach@google.com> | Fri May 19 17:31:52 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 19 17:31:52 2017 +0000 |
| tree | 6fd612fda92762668d90e6d4e61c4a9c734f1316 | |
| parent | 056594c93df4e74bac48b2c71b880fbbb06eba02 [diff] | |
| parent | f2fbd1b774e19df515b1287b10e1755e8196f054 [diff] |
resolve merge conflicts of 0533d66ae to oc-dev-plus-aosp am: f2fbd1b774 Change-Id: I28f342af24e3d230546a1e6f370fae521a2e1037