| commit | 72be1cd24db43bfcaeea026b88ba88661ecbda99 | [log] [tgz] |
|---|---|---|
| author | buzbee <buzbee@google.com> | Tue Nov 11 22:48:59 2014 -0800 |
| committer | buzbee <buzbee@google.com> | Tue Nov 11 22:48:59 2014 -0800 |
| tree | 7154e107d4cc1d2ddc27d2dd0a044bb1199ef4e7 | |
| parent | d37a4a630cf8074df84101d8fbf1552ed2e820f2 [diff] | |
| parent | 9f2a22593119a17123cec180ff75cb6c02fb1ced [diff] |
resolved conflicts for merge of 9f2a2259 to lmp-mr1-dev-plus-aosp Change-Id: I1aa72203e0a24250b78e7af866d1961ecd272472