summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2012-09-22 09:41:41 -0700
committerThe Android Automerger <android-build@android.com>2012-09-22 09:41:41 -0700
commita2161f8bb01815c30c57bdd604a5389c33269e2a (patch)
treec0ac024b9f8158a5163ea86dd072d8a3099de1c7
parentdf2bc29664d3bf80bed0012970608e5605acf7af (diff)
parent9565d8642490b8f222dcf56e80377602e105cd82 (diff)
downloadframeworks_av-a2161f8bb01815c30c57bdd604a5389c33269e2a.zip
frameworks_av-a2161f8bb01815c30c57bdd604a5389c33269e2a.tar.gz
frameworks_av-a2161f8bb01815c30c57bdd604a5389c33269e2a.tar.bz2
merge in jb-mr1-release history after reset to jb-mr1-dev
0 files changed, 0 insertions, 0 deletions