OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 20 Sep 2012 17:35:55 +0000 (10:35 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 20 Sep 2012 17:35:55 +0000 (10:35 -0700)
commit015a6f2decfa760604d91b2ae3cfa620a8111ea8
tree6ee18f7f5df495899b41475526cdbb507d4801ce
parentb2011cad4b2d45cb8a95d801f3dfc32f758dc878
parente8d09f895e27da1e3d483ad96d6de30a5de3acf5
Reconcile with jb-mr1-release - do not merge

Change-Id: I0800e6996dad4753a984e5b3bb2c791f12e7ddf7