OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 28 May 2013 14:37:45 +0000 (07:37 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 28 May 2013 14:37:45 +0000 (07:37 -0700)
commit52f3b7c3919a0ca35b4679b5227468efb1b4d459
tree03234dbfee5297a83b51cb1e39a61c8a368c3ac7
parent5c20af4c7c45e3da2150937d222f85c80b0965b8
parentf80c318799573fd0241b162e176703064b44c812
Reconcile with jb-mr2-release - do not merge

Change-Id: If34271bddb2819de365f53ba61b744b6598bda57