OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 3 Apr 2013 23:43:07 +0000 (16:43 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 3 Apr 2013 23:43:07 +0000 (16:43 -0700)
commitd503fa85deaf4c14d27f45c1408ed13f302f36f4
tree2782086c81b38d7cb29f49c130bbead8e0c8bb8f
parent712676772b0d6e32bdce3430eed0a4d9771aac7e
parent8d47f1f81b7ff49e96b712fb46d2873d12576438
Reconcile with jb-mr2-release - do not merge

Change-Id: If59d4eea208050457ffe142edea2aa28385e3aa3