commit | 92629cc4a9621907bca1ee45f55f68548b72bfd8 | [log] [tgz] |
---|---|---|
author | something15525 <something15525@gmail.com> | Wed Sep 11 09:38:50 2013 -0700 |
committer | something15525 <something15525@gmail.com> | Wed Sep 11 09:38:50 2013 -0700 |
tree | 6dfe1530fd4c2f15d6bcc51c9978f5f9c2f0cf0c | |
parent | dba0eeea35c174016539b7460b07fbe871f2a180 [diff] | |
parent | 0839ae958f8e883e77aae14323a31e98a14e0c00 [diff] |
Merge tag 'android-4.3_r2.2' into cm-10.2 Android 4.3 release 2.2 Conflicts: bluetooth/bdroid_buildcfg.h full_toroplus.mk overlay/packages/apps/Settings/res/values/config.xml recovery.fstab