summaryrefslogtreecommitdiffstats
path: root/policy
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-10-13 15:50:27 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-13 15:50:27 -0700
commit27c7fb1a861776b4fdc2632697e4e25eee83617f (patch)
tree1ce08046036c91039adc88610bde453973520dd9 /policy
parent0982d8d0d3b9d685a3c159519cb0d2eb705e3027 (diff)
parent90d59d180bd963f00161e6bfaabfda432960cab6 (diff)
downloadframeworks_base-27c7fb1a861776b4fdc2632697e4e25eee83617f.zip
frameworks_base-27c7fb1a861776b4fdc2632697e4e25eee83617f.tar.gz
frameworks_base-27c7fb1a861776b4fdc2632697e4e25eee83617f.tar.bz2
am 90d59d18: Merge "Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that." into gingerbread
Merge commit '90d59d180bd963f00161e6bfaabfda432960cab6' into gingerbread-plus-aosp * commit '90d59d180bd963f00161e6bfaabfda432960cab6': Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.
Diffstat (limited to 'policy')
0 files changed, 0 insertions, 0 deletions