tree c703dc5b6b550b5b537dc9672d8ea9c416126d09
parent 79d39a303e036dc70eccf2e2e7489fa0bbfd3a4b
parent 06e515dd77731c1752b2ea3b1b586bcd893f0927
author Jean-Baptiste Queru <jbq@google.com> 1339513350 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339513350 -0700

am 06e515dd: Merge "This patch addresses the following issues:"

* commit '06e515dd77731c1752b2ea3b1b586bcd893f0927':
  This patch addresses the following issues: