tree 74049ed558f3670af11ad2839d6ef763fd1c7ccc
parent 6168317f31d45cb4dad9d24d4b68cf6e7c40565a
parent 1b50e4ead5463f4dcc03f9c5ed64963af0d4d9eb
author Jeff Sharkey <jsharkey@android.com> 1366407516 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366407516 -0700

am 1b50e4ea: am ca2a6374: Merge "Environment should only warn when asked." into jb-mr2-dev

* commit '1b50e4ead5463f4dcc03f9c5ed64963af0d4d9eb':
  Environment should only warn when asked.