tree c26c3d38f786a7d017eb50a3dc96f76d5634a769
parent f6e11efd073741044fbcfe84347f1b21a551d3bf
parent 1e1bae1b0fc750f60ef9a2531850bbcf27ba6610
author Christopher Ferris <cferris@google.com> 1383680935 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383680935 -0800

am 1e1bae1b: am c2945850: Merge "Add some clarifying defines."

* commit '1e1bae1b0fc750f60ef9a2531850bbcf27ba6610':
  Add some clarifying defines.