| commit | bd968559294e5bcb0adc389b2e8f4a710cfa8ae5 | [log] [tgz] |
|---|---|---|
| author | Andrew Solovay <asolovay@google.com> | Tue May 17 16:09:03 2016 -0700 |
| committer | Andrew Solovay <asolovay@google.com> | Tue May 17 16:09:03 2016 -0700 |
| tree | 883f91b8c2634ff2dff4d8d6d96665c78ff1ca60 | |
| parent | 7c919ef8042c1864fb4ea39a663e6ff684bd0156 [diff] | |
| parent | 33d83dbd6ccc00969c7134c8bd84acc9c965781e [diff] |
resolve merge conflicts of 33d83db to mnc-ub-dev Change-Id: I8c148af6eec071ac076882a53c5ba2929cf0c9d2