Reconcile with jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 24 May 2012 16:01:52 +0000 (09:01 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 24 May 2012 16:01:52 +0000 (09:01 -0700)
commit7e62209a5ebd83d92ae51f4872723cb7f1a854ae
treef1a4c79960db2275985cfbbf0b606398cdcccd40
parent0cb81ea364ca9ac2c66e2ad2026d9b78bd792de5
parent538b15a631b682d89ffc88e09ca37e1ccc6f5842
Reconcile with jb-release

Change-Id: I5082e21795dab58054b3a6fea228ac6e0312be15