summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2012-10-07 06:59:17 -0700
committerThe Android Automerger <android-build@android.com>2012-10-07 06:59:17 -0700
commit16cd9950a486d2ae8f4ea7a0eb3610fffce93868 (patch)
treeac0bc2a73208f4703ce37f2232d49618e9ed2ba9
parent4d410ede659448557398c84552eb0bf50ef09cbc (diff)
parentef33212df1b937e187cca4ffcb9269775e1a4dd8 (diff)
downloadframeworks_av-16cd9950a486d2ae8f4ea7a0eb3610fffce93868.zip
frameworks_av-16cd9950a486d2ae8f4ea7a0eb3610fffce93868.tar.gz
frameworks_av-16cd9950a486d2ae8f4ea7a0eb3610fffce93868.tar.bz2
merge in jb-mr1-release history after reset to jb-mr1-dev
0 files changed, 0 insertions, 0 deletions