Qiwen Zhao dc8d416578 Merge commit 'f6eebb21' into master-nova ...

Conflicts:
	core/java/android/view/GLES20Layer.java
	core/jni/android_view_GLES20Canvas.cpp

2014-02-11 10:25:59 -08:00

..

androidfw

Extended locales in AAPT / AssetManager.

2014-02-10 15:50:16 +00:00

common_time

Move some system services to separate directories

2013-12-19 15:25:37 -08:00

hwui

Merge commit 'f6eebb21' into master-nova

2014-02-11 10:25:59 -08:00

input

Revert "Move inputservice over to frameworks/native"

2014-02-10 15:08:26 -08:00

storage

…

usb

…