OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Apr 2013 14:45:23 +0000 (07:45 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Apr 2013 14:45:23 +0000 (07:45 -0700)
commit7906ee682bef8d0acd15fd3e0852697100606f29
treea64dd7d8d5111e2c8e4fb7eb5b7be0cb4d178efc
parent468542ec0dc136c6703076bf2cc72fe3140f0eef
parent23eb1a5130edf1e2cbe6dacc9a8021761b259f16
Reconcile with jb-mr2-release - do not merge

Change-Id: I04fc3a249c15bac81c330ad09fd9edeca78b784f