Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 May 2013 12:43:56 +0000 (05:43 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 May 2013 12:43:56 +0000 (05:43 -0700)
commit38d9ff020b56bd7b1dfcbfa9f5c0185271bc08c8
tree0bfc41a6bb35b61da273a5f8fc74d4f2e183f746
parent612b1be67e8b13f2ab66f86f6d279133411d237a
parent6a55c15fd683b6ccf55ad3cca4131e531554c164
Reconcile with jb-mr2-release - do not merge

Change-Id: Iec327c611f56804aeddd1a4310e967b9fd6c7467