OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 12 Mar 2013 14:14:59 +0000 (07:14 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 12 Mar 2013 14:14:59 +0000 (07:14 -0700)
commitfbff14d927133d0c3b0aa35c5669cceba37b5137
tree2c96be63ce5b0161ab65c202c1525c5dd0e78e69
parentf586024a83ab431fdecdd2ef100fe502ed210573
parent6bf114bfda3b36729bc4e4ce7fddc1a7dc7bbc82
Reconcile with jb-mr2-release - do not merge

Change-Id: Iee469c89331fc9626c24bf2c42890c8abb7f1380