| commit | 7688a3c754ac48e726fe681ff9d6162275f15c6b | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Tue Aug 05 14:23:10 2014 -0700 |
| committer | Ying Wang <wangying@google.com> | Tue Aug 05 14:23:10 2014 -0700 |
| tree | c15caacba63aea9ada6a8f758cf7559371873482 | |
| parent | 55cbe8b157925ddcbaad37d9dffefda16dcda285 [diff] | |
| parent | ef4516ef22cef33d0371094aaaa51cfd413662a6 [diff] |
resolved conflicts for merge of ef4516ef to lmp-dev-plus-aosp Change-Id: I991e53af64149ee949a39892108712a2122c0b1b