tree 580a664ceea8a4d78fbf7e472402b1cea0e0b4f6
parent 7a4c83922e551506fdc6c5fbca6d107ebdeef867
author The Android Open Source Project <initial-contribution@android.com> 1236798716 -0700
committer Alex Ray <aray@google.com> 1375217809 -0700

auto import from //branches/cupcake/...@137873