summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2012-10-16 06:59:29 -0700
committerThe Android Automerger <android-build@android.com>2012-10-16 06:59:29 -0700
commitaf49b5e2c79728996e37a4e682be860330c18edc (patch)
tree7a478057b9f23065a8d0353fe75c7bfb9a4a2486
parentdb9b41fd157279d1b988a854e0d7c5b43c2fac38 (diff)
parent286d5fad99c6e689e03ce7c302930ded387b1bef (diff)
downloadframeworks_native-af49b5e2c79728996e37a4e682be860330c18edc.zip
frameworks_native-af49b5e2c79728996e37a4e682be860330c18edc.tar.gz
frameworks_native-af49b5e2c79728996e37a4e682be860330c18edc.tar.bz2
merge in jb-mr1-release history after reset to jb-mr1-dev
0 files changed, 0 insertions, 0 deletions