| commit | 0217e3b20b6a331b0820014dc136d782070bca45 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Tue Nov 18 16:28:04 2014 -0800 |
| committer | Ying Wang <wangying@google.com> | Tue Nov 18 16:28:04 2014 -0800 |
| tree | 6d85f6ebd5d5ca510c89e7e2f7cdc723e2a50c44 | |
| parent | 9a186a1c6dd501b1808fd3ab79317de5dec0669f [diff] | |
| parent | a4f415d65ea3bbf375b8b82a7ce5086612914679 [diff] |
resolved conflicts for merge of a4f415d6 to lmp-mr1-dev-plus-aosp Change-Id: Ibb54bce20342bd386ec85388d48c1c08e8b80197