tree ca11952a38992271e21ecc7c717bddad484e455f
parent 59d25cacdf92d787ac7ee07b144604c701ab776e
parent bbc96beb74c771f392d1325e83d8bd2b0b508b7d
author Dan Austin <danielaustin@google.com> 1459201704 +0000
committer android-build-merger <android-build-merger@google.com> 1459201704 +0000

Merge "Address const issues in preparation for libcxx rebase."
am: bbc96be

* commit 'bbc96beb74c771f392d1325e83d8bd2b0b508b7d':
  Address const issues in preparation for libcxx rebase.