summaryrefslogtreecommitdiffstats
path: root/media/java
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2012-11-30 07:27:36 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-11-30 07:27:36 -0800
commit386165a3ae09b150165e8e7c310e194231071271 (patch)
treef22995e0bfff6a1fe3d970ec299000cd2188ae51 /media/java
parenta4f67a88f421c454cb07a59e9ce5b0b720df55fc (diff)
parentfe0e1e445fe697d59baf5736da20356a4e548fc9 (diff)
downloadframeworks_base-386165a3ae09b150165e8e7c310e194231071271.zip
frameworks_base-386165a3ae09b150165e8e7c310e194231071271.tar.gz
frameworks_base-386165a3ae09b150165e8e7c310e194231071271.tar.bz2
Merge "Only show "charging" if the battery is really charging." into jb-mr1.1-dev
Diffstat (limited to 'media/java')
0 files changed, 0 insertions, 0 deletions