| commit | ad0cc34ddd3d11c88126010b1e05e31387e657ec | [log] [tgz] |
|---|---|---|
| author | Calin Juravle <calin@google.com> | Wed Nov 01 22:29:53 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 01 22:29:53 2017 +0000 |
| tree | 8be6895eb7abf12d3f2bac816d05a01fff0fd4a0 | |
| parent | b3145221ae6b1c8c770f46d7b4423234e7792005 [diff] | |
| parent | 71ae6b3aabcf0588069c79bedf4bf9d5dd2a7890 [diff] |
Merge changes I7bd99fc0,I329bc929 am: deee2e12de am: 71ae6b3aab -s ours Change-Id: Ia35c56d89cc56f315418da14ab0b19f2839a972e