OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 8 Apr 2013 20:36:23 +0000 (13:36 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 8 Apr 2013 20:36:23 +0000 (13:36 -0700)
commit04e7e51c574c26e25c628ba0c5dffee50eb02603
tree83975379e6211a87205d10d674e01d7bceebfcce
parentc06f97c19e2846b7998a73bc036b409db47e7ee5
parent97a9277584cc4c2f91a1035c1de5c1f4838603e0
Reconcile with jb-mr2-release - do not merge

Change-Id: I4014afe3d67f5b17d5877083bdea8e34bf32ab9e