| commit | 1b7abd2c450808ab36eb8c12b891fdf17179bd31 | [log] [tgz] |
|---|---|---|
| author | Rom Lemarchand <romlem@android.com> | Wed Feb 25 16:18:27 2015 -0800 |
| committer | Rom Lemarchand <romlem@google.com> | Wed Feb 25 16:18:27 2015 -0800 |
| tree | 71bc65540457bb6d2b6b2d6528678eff32845c1b | |
| parent | b0cc94bc0d70d44b337731e4028653a522d36ed1 [diff] | |
| parent | f7c53bd0bc9162cf4d44126c3ce39219bab1fb23 [diff] |
resolved conflicts for merge of f7c53bd0 to stage-aosp-master