| commit | a8abcb365b8ea94c7672b09e851488d9454135ba | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Tue Oct 14 17:17:22 2014 -0700 |
| committer | Dan Albert <danalbert@google.com> | Tue Oct 14 17:17:22 2014 -0700 |
| tree | a95d0dc5375f6f72e7341a51bd75a8b177159dd6 | |
| parent | 9b5e64a80878131dbf1e78d92565f4c39bff5c63 [diff] | |
| parent | 852fc3e69c6daa5ab4e4e12636020bee2b1af7e6 [diff] |
resolved conflicts for merge of 852fc3e6 to lmp-mr1-dev-plus-aosp Change-Id: I9809c14b2f9ffb539272aba66d3a27d8107b81ea