OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 9 Oct 2012 14:28:18 +0000 (07:28 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 9 Oct 2012 14:28:18 +0000 (07:28 -0700)
commit3b43dbce7c80b7b72bb3851cda955af9627d054f
tree518c52d3ed0153e4bdf4c917bc8a2817353836ea
parente807903b6e05ecfe1418e8694caef076e7136f8a
parentf42607c815773c1fdd09f0cd799aad8a8f064ba5
Reconcile with jb-mr1-release - do not merge

Change-Id: Ied76c774dce525f9e1ed5c59be92c7cd5bbd9059