OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 3 Dec 2012 19:34:34 +0000 (11:34 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 3 Dec 2012 19:34:34 +0000 (11:34 -0800)
commitafa8348248f9aa7cca59e1c74992fcd7ac6cbd90
tree63f5fd378c80fc9f7c33353cc9b128617229bae8
parentbeaa8a4d367ec14511fe6560e2103a3f7fb9d2ad
parent002c25eede2a33a5378c16c5bb9165179783e729
Reconcile with jb-mr1.1-release - do not merge

Change-Id: I0aecbf7623c5ae21fd0866857f89c30c3233f4d3