summaryrefslogtreecommitdiffstats
path: root/libs/androidfw
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2014-08-29 20:05:14 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-29 20:05:14 +0000
commitd6fe30be04717aed8282da396607db8c44f165b3 (patch)
tree4a5cfb99af357098fce3a278438f5d0d1d6bc4de /libs/androidfw
parentd57e1cb644fc9f9f5a5cc86b41dce01ff1c6cef1 (diff)
parent5e71b3fa907e94f14af0439b022d22398eec4b74 (diff)
downloadframeworks_base-d6fe30be04717aed8282da396607db8c44f165b3.zip
frameworks_base-d6fe30be04717aed8282da396607db8c44f165b3.tar.gz
frameworks_base-d6fe30be04717aed8282da396607db8c44f165b3.tar.bz2
am b616b94b: am 247e8e84: Merge "Revert "Make UsageStats API comply with API Council"" into lmp-dev
* commit 'b616b94b63b91d17140a31ef65fa26cb261a67f4': Revert "Make UsageStats API comply with API Council"
Diffstat (limited to 'libs/androidfw')
0 files changed, 0 insertions, 0 deletions