OSDN Git Service

Reconcile with jb-nakasig-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 15 Sep 2012 15:21:27 +0000 (08:21 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 15 Sep 2012 15:21:27 +0000 (08:21 -0700)
commitfd14e2425fc0d1efa1295d1dbf6b0d1b058730b4
tree980415a874ad1f6711cd81bf647df6477b2d632d
parent7916e624bd0f084b945ec39dd258057ed8e5dd6f
parent00e84851d14edfaac9cb732193aac0d3e5ef2da7
Reconcile with jb-nakasig-release - do not merge

Change-Id: I48d8019902c8848541677a7ddc1aa63edf74b23c