OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 20 May 2013 15:20:36 +0000 (08:20 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 20 May 2013 15:20:36 +0000 (08:20 -0700)
commit2e0f41bc7ccf39a399d4573c62f75d26b0dea279
tree7f1b2c0c222c4b6222c79530962bbf939a7531a1
parentb5d2ad2266283b4e9eac217831b00a4083ed8d21
parent85ee207061fb799e765560540911437d0d01a81a
Reconcile with jb-mr2-release - do not merge

Change-Id: I326060063e4586e6bfa9edafc93b26a89a47a7b7