Slimmed Down repo sync
Slimmed down repo sync
Merge branch 'android-4.4' of https://github.com/shortsamshort/android into android-4.4