| commit | 49cc929d0748fa62b42cef7b4dcfd372cafe891e | [log] [tgz] |
|---|---|---|
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | Wed Jul 24 20:51:47 2013 +0100 |
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | Wed Jul 24 20:52:54 2013 +0100 |
| tree | 799ae959c4cd6fac8676c4e8a46685538d407a61 | |
| parent | a4a7f84b08324245b9777c439beae3f7a8810568 [diff] | |
| parent | 38d9178d358b860ac99bcefb1c65a6a2b6ec098d [diff] |
Merge tag 'android-4.3_r2.1' into cm-10.2 Android 4.3 release 2.1 Conflicts: ide/eclipse/.classpath sdk/plat_tools_source.properties Change-Id: I02498afb48cf3f128e55c50d197f6da92dbf342b