tree 5e86f2e64a00eb6d1cf7fb9c724f5d9f20e8d206
parent 8f91cebafb81c066046842a0f0b892cecea1466a
parent 9d833757190dc6f7dee5971e6c2c02c9740bda16
author Colin Cross <ccross@android.com> 1449190143 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1449190143 +0000

Merge "Opt-out of STL"