| commit | 5712d5d04640925970db9c98938ffaf806b3962c | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Wed Sep 18 17:59:36 2013 -0700 |
| committer | Mathieu Chartier <mathieuc@google.com> | Wed Sep 18 18:05:34 2013 -0700 |
| tree | d1a8da088f4b62369aa6418a5c36449a5e6cdc1c | |
| parent | 8aa003fcb06c3473a9e58d2071f2518aa53077f8 [diff] | |
| parent | f466553d7f2f941765adaa657c340ff31b55d891 [diff] |
resolved conflicts for merge of f466553d to dalvik-dev Change-Id: I1205b5c5da3a02e410fff760a8b0dda41cb7249f