summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-06-15 17:12:45 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-15 17:12:45 -0700
commit995e8f239ab52aaf017f4b16c2b3e0a235028bdd (patch)
tree01e09e2a5586c79999831795bce23b509374fcce /libs
parent9662a00232e5c85b5b9ffe235661ee87b3017c9d (diff)
parent7bc78b3c103c6a53b0747e436ac62e8ecc3d4ca2 (diff)
downloadframeworks_native-995e8f239ab52aaf017f4b16c2b3e0a235028bdd.zip
frameworks_native-995e8f239ab52aaf017f4b16c2b3e0a235028bdd.tar.gz
frameworks_native-995e8f239ab52aaf017f4b16c2b3e0a235028bdd.tar.bz2
am 413b53b5: am 70921d61: Merge "We must keep up with the Joneses." into honeycomb-mr2
* commit '413b53b57d62b60e98cfe5b9359551315e7cb3a7': We must keep up with the Joneses.
Diffstat (limited to 'libs')
0 files changed, 0 insertions, 0 deletions