tree 8a2ad642b3eb79903546ed32f689a47927a9a405
parent d113938bf816d5a656d65dc8b132a9b206f0ba53
parent 255f7cb02a5f54562efaf54ddd044c1d0d0fc2d2
author Daisuke Miyakawa <dmiyakawa@google.com> 1286206587 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286206587 -0700

am d8f1a540: Merge "Refrain warning when not appropriate. Do not merge" into gingerbread

Merge commit 'd8f1a540162e16d88cae9a1e8ec58cba68adf6e2' into gingerbread-plus-aosp

* commit 'd8f1a540162e16d88cae9a1e8ec58cba68adf6e2':
  Refrain warning when not appropriate. Do not merge