| commit | bc4da97ce0fcd0ddef228048bc663e383776c323 | [log] [tgz] |
|---|---|---|
| author | Etan Cohen <etancohen@google.com> | Sat Jun 06 00:40:46 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Jun 06 00:40:59 2015 +0000 |
| tree | fa1741409640da5298441afe5cd98acd97b9227f | |
| parent | 5e42c1cf1c7786a550df351622865ba1710a0ea6 [diff] | |
| parent | 358c3a6cde8c68c176aedefdc1a477130eeda3e5 [diff] |
Merge "Fix build: bad merge" into mnc-vt-dev