summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2012-09-23 18:59:44 -0700
committerThe Android Automerger <android-build@android.com>2012-09-23 18:59:44 -0700
commit46323541d634c881826040dece9e4891fdf0ae52 (patch)
treebbf52f1eb8428c0d1f30b28219a6b19f4df4ef62
parent94a68ecf2b56bd56994d0352cbaad56e58dcf0dc (diff)
parenta2161f8bb01815c30c57bdd604a5389c33269e2a (diff)
downloadframeworks_av-46323541d634c881826040dece9e4891fdf0ae52.zip
frameworks_av-46323541d634c881826040dece9e4891fdf0ae52.tar.gz
frameworks_av-46323541d634c881826040dece9e4891fdf0ae52.tar.bz2
merge in jb-mr1-release history after reset to jb-mr1-dev
0 files changed, 0 insertions, 0 deletions