am a388b6f3: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do...
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Oct 2012 16:47:49 +0000 (09:47 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 10 Oct 2012 16:47:49 +0000 (09:47 -0700)
* commit 'a388b6f3158f06c3c2c6b8d16d35d87b9ec028a5':


Trivial merge