tree 5eec4c2e4165e67a8dc85683ee9a6ae3cec56594
parent 54d9fc2830fd770e58aa73af5238bda7512d3cfd
parent e61d6d2d8f91dfe570d4cba60b365c418dcc0fb9
author Jean-Baptiste Queru <jbq@google.com> 1329258516 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1329258516 -0800

am e61d6d2d: (-s ours) Manual merge - DO NOT MERGE

* commit 'e61d6d2d8f91dfe570d4cba60b365c418dcc0fb9':
  DO NOT MERGE