| commit | 83892ecb5c38f6e8a216e1596cd6a16bf7bd6a55 | [log] [tgz] |
|---|---|---|
| author | Andreas Gampe <agampe@google.com> | Fri Nov 07 23:15:28 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Nov 07 23:15:30 2014 +0000 |
| tree | c0ca4f84fb798afa5704d02909c3785bdd1de6aa | |
| parent | 284ab646d879dcca4bcc287b26e8c50abc56666d [diff] | |
| parent | dc9c109af815100d497184e6dadebceed7f3bf1d [diff] |
Merge "resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp