summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2012-08-16 06:33:59 -0700
committerThe Android Automerger <android-build@android.com>2012-08-16 06:33:59 -0700
commitec7ba01af8e989c919911c4d0d1fa2d92fd08222 (patch)
tree65604b20e2555cfa7b427d75f6f26e317b930b19
parent13233e067b8f71adc3a0ade5f442265e1f27084b (diff)
parente5769db877e3ebc55195b4b53a95b51587d7b5b2 (diff)
downloadframeworks_native-ec7ba01af8e989c919911c4d0d1fa2d92fd08222.zip
frameworks_native-ec7ba01af8e989c919911c4d0d1fa2d92fd08222.tar.gz
frameworks_native-ec7ba01af8e989c919911c4d0d1fa2d92fd08222.tar.bz2
merge in jb-mr1-release history after reset to jb-mr1-dev
0 files changed, 0 insertions, 0 deletions