OSDN Git Service

Reconcile with jb-mr0-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 17 Aug 2012 01:57:02 +0000 (18:57 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 17 Aug 2012 01:57:02 +0000 (18:57 -0700)
commit8543723f37f6f8c42562e13d0ecaeeaa3a2d3e41
treeb9aa307dafec077ad0c6092a27df522335228340
parent8ddcdbd494298eb5198643600fb1f8693b618995
parent7a6674d1b1c68b3919709399c5e820e501d26496
Reconcile with jb-mr0-release - do not merge

Change-Id: Ie2c8260df9e0ee2206448b14f61be060206c22ba