| commit | 6c3b4a3545e7d9806a3279ccbcd66485e6fe1d09 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Tue Sep 16 14:39:10 2014 -0700 |
| committer | Brian Carlstrom <bdc@google.com> | Tue Sep 16 14:39:10 2014 -0700 |
| tree | 3e171f93beb39a60eb7cc6f1395b0d2eb231820c | |
| parent | 6a0b71e72f9d5512737dee9a2df543a8a9241d4f [diff] | |
| parent | 100d341c52e312a7bef8d9b641b090f71993ee64 [diff] |
resolved conflicts for merge of 100d341c to lmp-dev-plus-aosp Change-Id: I4cf5f2c8a64361b78adfc42459eeea249d0514c6