tree 71706734b0ebb7ab4239c3e1b5e5fdbd6a772f2d
parent fbd2cab0aa277a70c42710029762ec53e524fe74
parent 934fa7f10f08c5342ff1714bda66110b19928826
author Elliott Hughes <enh@google.com> 1503542850 +0000
committer android-build-merger <android-build-merger@google.com> 1503542850 +0000

Merge "Add more const-correct C++ overloads." am: 7b4fb64177 am: d451927b51
am: 934fa7f10f

Change-Id: I7a5f3e031b7042d8d6470da8cc01c7d0a432fa16