tree 1b4eb72c1efbfaca9e9623c976040ecdd208fff5
parent 37cbee829173da6b62da75c285b7269fa5064bcd
parent 7162944c155778c64d6179a83c23cf9a5653a14b
author Sunny Goyal <sunnygoyal@google.com> 1435600370 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435600370 +0000

am 7162944c: (-s ours) am bb87053e: (-s ours) [DO NOT MERGE] Making some constants public

* commit '7162944c155778c64d6179a83c23cf9a5653a14b':
  [DO NOT MERGE] Making some constants public