OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 3 Jun 2013 23:43:54 +0000 (16:43 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 3 Jun 2013 23:43:54 +0000 (16:43 -0700)
commitc7d13ed362760cde68c339cdc733a1f964fc4065
treea91f7bd2f68f120d25fb0d0d0ac7b48a0ac60d86
parent2c9a291277f3eb6c13943cdca3fd99c74b2ee3b3
parent6278392f3d5fa391ddef2e8017038821dda61f8a
Reconcile with jb-mr2-release - do not merge

Change-Id: Id191ec4ec57aba482a2e504c2ad8cd5a1af91c53