tree c8e733b26703cf7544140d6cdb39f18ee3caeca1
parent c86f130a3f88b450db634544183eea337fc7083d
parent c450359d87c082425d5c6aea0fe48e0bbb29a290
author Eric Laurent <elaurent@google.com> 1285270383 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285270383 -0700

am c450359d: am 1007a8dc: Merge "Fix issue 3022800." into gingerbread

Merge commit 'c450359d87c082425d5c6aea0fe48e0bbb29a290'

* commit 'c450359d87c082425d5c6aea0fe48e0bbb29a290':
  Fix issue 3022800.