| commit | 5ef02c3c7c7b3e8b8755dba3a71abd8ac104db02 | [log] [tgz] |
|---|---|---|
| author | Brint E. Kriebel <bkriebel@vmware.com> | Wed Jul 24 17:38:20 2013 -0600 |
| committer | Brint E. Kriebel <bkriebel@vmware.com> | Wed Jul 24 17:38:20 2013 -0600 |
| tree | 5fae460fef5d1ecafbd3fb2f94ccba52c0534103 | |
| parent | f350dca68ef0ee3e754e002e9f1b439cc69ecd18 [diff] | |
| parent | 34c9869a8bcf1af20fc9889b2bd98c8d56a1cd33 [diff] |
Merge tag 'android-4.3_r2.1' into cm-10.2 Android 4.3 release 2.1 Conflicts: BoardConfig.mk init.tuna.rc recovery.fstab Change-Id: I622650b19a49679badea37a0e4beb7da29dd3671
