OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 17 Aug 2012 02:10:39 +0000 (19:10 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 17 Aug 2012 02:10:39 +0000 (19:10 -0700)
commit69543c7ce529a475e9d14d218916fa25657bf7f3
treee79512a2c1882c368b007f5df4565a3cbcc7a53b
parent0bbd95b9beece22fe7f833e6def244e39536a95e
parentec7ba01af8e989c919911c4d0d1fa2d92fd08222
Reconcile with jb-mr1-release - do not merge

Change-Id: I2f5150a2972fd8cc92ed4c38c975a8ac73283879