OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 18 Dec 2012 17:44:44 +0000 (09:44 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 18 Dec 2012 17:44:44 +0000 (09:44 -0800)
commita6dd202da14c2a0e75ea03807458f5c8cd319888
tree2f516bfdac6accf8857ced26c3fa85be0e226c18
parent5031683a729917ae45047bfc33b7f89705c4c530
parent29a4eb7a33da12a957b3305138ada69140d8ab75
Reconcile with jb-mr1.1-release - do not merge

Change-Id: I3ce5c84d693ade39f0ffa17313acf7b0df85b934