| commit | dc9c109af815100d497184e6dadebceed7f3bf1d | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Fri Nov 07 15:03:46 2014 -0800 |
| committer | Andreas Gampe <agampe@google.com> | Fri Nov 07 15:14:02 2014 -0800 |
| tree | 51bb2aa4ff78b0ebcdbe1cc474c76dd2d38d7a37 | |
| parent | 9a0aa553ad9f6657cbbf0a182566c481e191e6b7 [diff] | |
| parent | 487ae9b8dc3e08c1a830d519a801a07cd59c8f2b [diff] |
resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp Change-Id: I395f184d885a7ef30aa113ab01fcaacc94243008