| commit | 3a091b79978caa9b5d58ae19f693279e5a717c2a | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Thu Nov 20 15:41:25 2014 -0800 |
| committer | Dan Albert <danalbert@google.com> | Thu Nov 20 15:41:25 2014 -0800 |
| tree | 4c2624225f565fd66f80c3475311a0262059caca | |
| parent | a8f7a40b4b98f19b5ee99a8dfb4177d430707623 [diff] | |
| parent | 8e0cfe7c9e3a5bb5d9a8444fd357a44e72fd01f1 [diff] |
resolved conflicts for merge of 8e0cfe7c to lmp-mr1-dev-plus-aosp Change-Id: I068d2a0fb118d4e2b4c1e546bebfcbc2cb120d36