| commit | a103ebed6e9a44a406b31636791d2970c882ec44 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Wed Sep 24 15:37:53 2014 -0700 |
| committer | Andreas Gampe <agampe@google.com> | Wed Sep 24 15:38:02 2014 -0700 |
| tree | 67913458dd8dbbbef4d832236d049eca5237afd6 | |
| parent | ec4697fad77de0ddcddd03c23db1ff256b8d4261 [diff] | |
| parent | dfdabe37286f73da0f670367865cd39385558ecf [diff] |
resolved conflicts for merge of dfdabe37 to lmp-dev-plus-aosp Change-Id: Ia9c350dcfb41f9d04400a86bd7e5f2cf2af656f1