OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 19 Dec 2012 16:37:24 +0000 (08:37 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 19 Dec 2012 16:37:24 +0000 (08:37 -0800)
commit5e86fd1570b943e02d8435b2ce27a1806b72ee2c
tree616c1fe17f77b10f8bdbd520c4b06af4f08ede96
parentb4f56f00d0e69551ed1a1c3fdbe6056e7e6ac259
parent643443e1cc8e827ff011c5e6885e5e713c1a481f
Reconcile with jb-mr1.1-release - do not merge

Change-Id: I3381ba02649abcb559115d5bf1e508ca1f361a66