tree dc4b61d860666e8b7f51316cd815a8af78fe8ac8
parent a730c7316f0bc502e69999e683ad5d615e2ceaa6
parent a419aef2af5a8c987302c658df5fd92635a46d09
author keunyoung <keunyoung@google.com> 1365036675 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365036675 -0700

am a419aef2: am 8c1ee69b: DO NOT MERGE resolved conflicts for merge of 317bb63c to jb-mr1-dev

* commit 'a419aef2af5a8c987302c658df5fd92635a46d09':
  DO NOT MERGE verifier to R6