OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 27 Nov 2012 15:43:34 +0000 (07:43 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 27 Nov 2012 15:43:34 +0000 (07:43 -0800)
commit17b0879f5c4ea61e49dd17756786d762dd603a72
treea2c2d35db851fe3ccf5085b5b947fc8c8886d686
parent9a9166b3df3692d928e048aa066b89a02837ed87
parentf2d922a5b21af0e6430398015dad06863ac18ae6
Reconcile with jb-mr1.1-release - do not merge

Change-Id: I499b518412a7bd7fda77560aed8f66a798013cd1