summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Automerger <android-build@android.com>2012-08-29 06:33:49 -0700
committerThe Android Automerger <android-build@android.com>2012-08-29 06:33:49 -0700
commit37a32cb55585364f645dd3f187566d81ddf050fe (patch)
tree9b2bfa5433bac80b41fe27430cf8f8976518cffd
parentb82af2a8aec99faf6fd37d202b98224cee461a12 (diff)
parentd026a1e163c21bc229962f4662c3a1db7e0f443c (diff)
downloadframeworks_native-37a32cb55585364f645dd3f187566d81ddf050fe.zip
frameworks_native-37a32cb55585364f645dd3f187566d81ddf050fe.tar.gz
frameworks_native-37a32cb55585364f645dd3f187566d81ddf050fe.tar.bz2
merge in jb-mr1-release history after reset to jb-mr1-dev
0 files changed, 0 insertions, 0 deletions