OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Oct 2012 15:16:37 +0000 (08:16 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Oct 2012 15:16:37 +0000 (08:16 -0700)
commit6c9282d3bb5082266cfd9042f62ceea131e5b849
tree1165655cf131ab53425b092244da8ceb9fad0fcb
parente68eb9b82d0371324add708e2b2eb45a99ddbd70
parent38f1a2cb3c0f6fd3a4b9659e1761f3ff4128b1c3
Reconcile with jb-mr1-release - do not merge

Change-Id: I9545f52b76d36bfbdf29cd270d0af200cb2d51fe