| commit | 810b1d704f2db0d935bf5dddae3545f79cabd435 | [log] [tgz] |
|---|---|---|
| author | Mathieu Chartier <mathieuc@google.com> | Fri Sep 20 14:02:02 2013 -0700 |
| committer | Mathieu Chartier <mathieuc@google.com> | Fri Sep 20 14:02:02 2013 -0700 |
| tree | baf1ec61b47031244cb1fe2458b136c9f9d54f1f | |
| parent | 5c00e28cdc7da675451869a2e5baa8f1c3244892 [diff] | |
| parent | bb0140e051e62ca0b51b0870c2386ae3110b0556 [diff] |
resolved conflicts for merge of bb0140e0 to dalvik-dev Change-Id: I31e0c05c5e917cf3275296a7f65bd8b78ec9b78b