tree e780750523e4f032abf902a0e6ff8b9d52c54e54
parent 7aa707a5d654b7af67b133955c454c8e23a12abc
author The Android Open Source Project <initial-contribution@android.com> 1236133725 -0800
committer Alex Ray <aray@google.com> 1375217809 -0700

auto import from //depot/cupcake/@135843