| commit | 935fd8d0b1c7953e6e6610aea0c2d09d0fa8ba97 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Fri Nov 21 18:08:10 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Nov 21 18:08:12 2014 +0000 |
| tree | dd3780e6125f6bcb9056210d9be8ccb9a49b6885 | |
| parent | 034b9092fb93f03e6e723ac6eac8d8d0e8c4048a [diff] | |
| parent | 307218c7f2e3edac95c2d4d31fa3beadcde3d30c [diff] |
Merge "resolved conflicts for merge of 09910723 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp