OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 7 Dec 2012 15:53:15 +0000 (07:53 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 7 Dec 2012 15:53:15 +0000 (07:53 -0800)
commit7bd5a76e2e89ca6d172539ef2dfa43f42f07c001
tree712613768b3e8e60adb7e37aaa0b992c8862d35b
parent05989772d5b46cd5328e88d546f04deef39cc3c8
parent2fef5c45e7e78e4209f397020c5008116899bc11
Reconcile with jb-mr1.1-release - do not merge

Change-Id: Id716af997b29350c4600ae941107e96d27f1b0af