| commit | dc5a528c10462726682b8f490772e0677b038c1f | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Jun 07 18:17:11 2012 -0700 |
| committer | Brian Carlstrom <bdc@google.com> | Tue Apr 30 14:52:21 2013 -0700 |
| tree | ea223ce1662a8a0e0e08ce701f93760037e18003 | |
| parent | 0436f436f122e7e74285faf32b8db2259f56ded7 [diff] |
*libcore* resolved conflicts for merge of bc23c4f3 to dalvik-dev DexBuffer became Dex, and moved to libcore. Change-Id: I32447f83c03dd18f2339e879d015134be9f4fc18 (cherry picked from commit 621d004d61b3eaca74fc045a3fba6afa14327a2e)