summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Filip Gruszczynski <gruszczy@google.com> 2014-11-05 18:49:39 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-11-05 18:49:39 +0000
commit093e98908743eb37104a280541a060dcd46351d0 (patch)
treeb0a5f66961b2a82a4f9066cbff41c5d1cd83befa /libs/androidfw/ZipFileRO.cpp
parent0bfb97cddfadcc0d580bca78c4368efac4edd23e (diff)
parent34afdf0276044f7d40c58df65dd13b9cb774d7c6 (diff)
am 34afdf02: Merge "Automatic brightness using ALS while dozing." into lmp-mr1-dev
* commit '34afdf0276044f7d40c58df65dd13b9cb774d7c6': Automatic brightness using ALS while dozing.
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions