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:47 +0000 (11:06 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 4 Mar 2013 19:06:47 +0000 (11:06 -0800)
commita3b948e727a38582b88f1d3c7b604c0e3712f04f
treeadf03e3e4c5de3bdc7ade7f954232c3c635f51ca
parentbbb57f3331c7182399ed82e9c4f93a965677dde3
parent3aa06a3930979ec210c5263ba405b25903335193
Reconcile with jb-mr2-release - do not merge

Change-Id: I8176eb9302e58477ef1bd9b394a974d85fa67792