am 38d9ff02: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 May 2013 12:48:21 +0000 (05:48 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 May 2013 12:48:21 +0000 (05:48 -0700)
commit963272620eb339f4d2a119e57b2233b00a4d188d
tree9f54fcc4050f9a1595c740f515654558b9768343
parent5e1c49d634083d2072374f8b75e9e561c4723764
parent38d9ff020b56bd7b1dfcbfa9f5c0185271bc08c8
am 38d9ff02: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '38d9ff020b56bd7b1dfcbfa9f5c0185271bc08c8':