| commit | 66dc4c2fb7a907135da8e8508c23c69b460f2411 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Thu Jan 10 14:28:56 2013 -0800 |
| committer | Ying Wang <wangying@google.com> | Thu Jan 10 14:28:56 2013 -0800 |
| tree | 5551cb77b2168fd0397fd5ef69314165e8fa5c99 | |
| parent | fc1c1a217b36605c3d613aa5ed5d422990bdd6eb [diff] | |
| parent | 038908a7360c064762de1515a5cd1b662363aeaf [diff] |
resolved conflicts for merge of e016e80c to jb-mr1-dev-plus-aosp Change-Id: Ic1546db5d009307789e0c7fda811982f80655dea