OSDN Git Service

am ff76bfee: am 28b6c520: Ooops, override the right variable
authorJean-Baptiste Queru <jbq@google.com>
Mon, 2 Apr 2012 19:57:13 +0000 (12:57 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 2 Apr 2012 19:57:13 +0000 (12:57 -0700)
* commit 'ff76bfeec857c4732c39972d34caf23c1d37ae26':
  Ooops, override the right variable


Trivial merge