| commit | b3c3f9384f3ba864baac1ea7d0f7ed6e9c125ff2 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Fri Jul 25 11:38:28 2014 -0700 |
| committer | Andreas Gampe <agampe@google.com> | Fri Jul 25 11:39:45 2014 -0700 |
| tree | 3fb92c60ac805ea2e216aa229548f46cc1518054 | |
| parent | 749647c974791ce91e179e465f0b275d6cf54111 [diff] | |
| parent | 307f650806e55ea54e7562a25a20b4b79f65271b [diff] |
resolved conflicts for merge of 307f6508 to lmp-dev-plus-aosp Change-Id: If49761765f3346993fb67068e79dad65e161c6a5