| commit | eecf00db59874332b52e9fc6bcd212ab62e8621e | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Fri Mar 27 14:28:51 2015 -0700 |
| committer | Dan Albert <danalbert@google.com> | Fri Mar 27 14:37:14 2015 -0700 |
| tree | bb1a21470fd2c0f1aeecc154f0b7364bf5a5a253 | |
| parent | f6dfd7b608f4e53b83dcb0713447f3040a0790f2 [diff] | |
| parent | 4c32aa3d0e70615b346e405f441b4b1903c5c55e [diff] |
resolved conflicts for merge of 4c32aa3d to lmp-mr1-dev-plus-aosp Change-Id: I32a06c88416e68ce628f642e0d025d1df5e227d7