merge in jb-mr1-release history after reset to jb-mr1-dev
authorThe Android Automerger <android-build@android.com>
Thu, 2 Aug 2012 15:18:13 +0000 (08:18 -0700)
committerThe Android Automerger <android-build@android.com>
Thu, 2 Aug 2012 15:18:13 +0000 (08:18 -0700)
commit19c502debe378371c3e6aec123dab534d984a84a
tree0ee7c942281fe5de31902d157b19717eef66d09d
parent2607aa30bcae2244e1bc68cbc0a0fc5a2b4ef570
parent3185f270e1a67bd279eab399fdc16dfced0c682b
merge in jb-mr1-release history after reset to jb-mr1-dev