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:36:07 +0000 (10:36 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 20 Sep 2012 17:36:07 +0000 (10:36 -0700)
commit1c63e86f16aa01f2ef48747cc494bf8f9bba108a
tree00356a61649a967a5514ec76f685c74c59e6028d
parentb53b4389c0fc2ea40d31aade956c5210ef8ab503
parent9ffeb1522baefdb4499b9937ff600a7fbefac71d
Reconcile with jb-mr1-release - do not merge

Change-Id: If425346af9f905a95bbcdcc41035ce937280528c