| commit | 4c35627d7d01d8196fe87258c4bb49602a006683 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Fri Nov 21 10:36:14 2014 -0800 |
| committer | Andreas Gampe <agampe@google.com> | Fri Nov 21 10:36:14 2014 -0800 |
| tree | c2163d1d4c17f028757b723d0ee40a9390540207 | |
| parent | fb978eb150358b3fc913e43802c1babf63322833 [diff] | |
| parent | b9fd0471a6957f8f2e4601811afb4a04412b5e3b [diff] |
resolved conflicts for merge of 3fc5e3ca to lmp-mr1-dev-plus-aosp Change-Id: Id8286e5a4381315a6060251a8055b0f1d1a96019