tree 60ecb5a0a173022524d5810e930f0d4064697b21
parent cb5f619770df68e6cd323c85602bb64c4acea8cc
parent 42ea0db8892020cc07046979892460bad55d2b45
author Sunny Goyal <sunnygoyal@google.com> 1435599675 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435599675 +0000

am 42ea0db8: (-s ours) [DO NOT MERGE] Adding constants already available in burnaby

* commit '42ea0db8892020cc07046979892460bad55d2b45':
  [DO NOT MERGE] Adding constants already available in burnaby