OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 4 Mar 2013 19:06:28 +0000 (11:06 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 4 Mar 2013 19:06:28 +0000 (11:06 -0800)
commit0729ec54cdc856990366b401a117daec11c2dc97
treeae4b1ec5a307b6947599d6451b0403d7d94231e1
parent0410d3ef3d9578177bffb06a657b1addab605167
parent349a24991312310f2173963cb814f588585e5127
Reconcile with jb-mr2-release - do not merge

Change-Id: I0b8102a3962010378a8e19955a38c9cc44bd1c95