OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Apr 2013 17:46:12 +0000 (10:46 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Apr 2013 17:46:12 +0000 (10:46 -0700)
commit987f727da2f90d428ae773a58cafc4ea67737aab
tree6e6a6c03def154c546df73cb82dd3b15adf6e463
parent0c3b91120788d2f09cf8e8617cfe7b9ee705ba44
parentcec19a1d4fe656b14beab9c3f1b61ea605cc8599
Reconcile with jb-mr2-release - do not merge

Change-Id: I98befd6a263feb5235d4a8aa20abff47a2a8a097