OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 23 May 2013 15:05:05 +0000 (08:05 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 23 May 2013 15:05:05 +0000 (08:05 -0700)
commita842a2a61927be0c1f643e76c6ba072e6ae9f779
treeccf66a82a795d51116485ce03525604ed68a69ee
parentb7337d56a72c9b20abf57e853953126d0aa3dd1a
parentfead4f18b201e8228b59cafe2734a1d65567ff92
Reconcile with jb-mr2-release - do not merge

Change-Id: I93c0800a90b8c82a59e9f2de7d89d78bf8304733