OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 21 Aug 2012 23:04:39 +0000 (16:04 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 21 Aug 2012 23:04:39 +0000 (16:04 -0700)
commita5b7d6dd00914651f77c4ff6604a2c16df6d73b9
tree59b6a4e728264e1c580dae2dcfe0741e96551312
parent5e2aa357d2f76a01c403a208524137c6fccf7304
parent5d8cfb3e663b2f67f08720bcf42e7413c92b3020
Reconcile with jb-mr1-release - do not merge

Change-Id: I559e0ba590f5beee87871ecfbdfc185566d40f9f