Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Apr 2013 17:05:50 +0000 (10:05 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Apr 2013 17:05:50 +0000 (10:05 -0700)
commit87adbf5234355371b0284353d03980b65b45b23c
tree7529f38a5403a13f727759c918ea865a180c3f11
parent27877c2ff75ec10b994f7e0cfdd5f1b82fc37201
parent9d74e8250a8eaab2eb46715ce880c909bb850e43
Reconcile with jb-mr2-release - do not merge

Change-Id: Ib821de8f91e2992b52565dbd8c10a94e37c0ee45