tree dedf9f2dcd1ee1c06c686402029863b04492d569
parent ce9ba82246b77ed441cea6dc25d31b2c130481b3
parent c738e4f02662055c8f7ccca0212144af29360de9
author Sunny Goyal <sunnygoyal@google.com> 1435600372 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435600372 +0000

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

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