summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2012-08-02 07:16:59 -0700
committerThe Android Automerger <android-build@android.com>2012-08-02 07:16:59 -0700
commita8545d555ec232a27de30ef452c40daef9f0bba2 (patch)
tree3ae9b24b05f4b898ac84764229a83decd9b03c82
parent53f10b7b13363e6d017985ead704494fe79c9e09 (diff)
parent08da0bf17caeb564d7fe7a0b08b057df2f8ca45e (diff)
downloadframeworks_native-a8545d555ec232a27de30ef452c40daef9f0bba2.zip
frameworks_native-a8545d555ec232a27de30ef452c40daef9f0bba2.tar.gz
frameworks_native-a8545d555ec232a27de30ef452c40daef9f0bba2.tar.bz2
merge in jb-mr1-release history after reset to jb-mr1-dev
0 files changed, 0 insertions, 0 deletions