OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jun 2013 01:04:15 +0000 (18:04 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Jun 2013 01:04:15 +0000 (18:04 -0700)
commite2ae01114dac2abecf3aeed1d6fb13bdcfb93a7b
treeb3e734a716e9a885ef2ee0d95fb9b1a93e535024
parent80d56531103249f103d7cb680cd431b059ff1d43
parent5ac124384f6090f48fb0be5e8a80ad8fd792b87f
Reconcile with jb-mr2-release - do not merge

Change-Id: Icee761e7873b6c14395d33c06ad53f5bff480839