OSDN Git Service

Reconcile with jb-nakasig-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Sep 2012 18:25:29 +0000 (11:25 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Sep 2012 18:25:29 +0000 (11:25 -0700)
commitfc9e3924a2b9daa55818d7f0b1d819bf171535f5
treef30abada1beabd99d67f61fd27a8c13a62753634
parent3e91f5ad763983af56f54d794045f451265f8d91
parent024057416cb7d9dbdfb91617376f02c6beddacd5
Reconcile with jb-nakasig-release - do not merge

Change-Id: Ic4af6ed24af4503222b6b31e87a2e45fc07cb47e