tree bd40cbda01b2b9997706b36c5311c99b2fd8525e
parent 6da6ad9ffa98b548b61fcee344b7174f270befd6
parent a2a13e3267850b4eaf2689b0e02cc499228b7bf5
author Dan Austin <danielaustin@google.com> 1459360100 +0000
committer android-build-merger <android-build-merger@google.com> 1459360100 +0000

Merge "Address const issue in preparation for libcxx rebase."
am: a2a13e3

* commit 'a2a13e3267850b4eaf2689b0e02cc499228b7bf5':
  Address const issue in preparation for libcxx rebase.

Change-Id: Ia54835c35695ae76b3c093adfb256bab2446ff65