tree 3273581c7b684086c20d8578f404a4968e534406
parent c830e7db7fc1dcfc94224a7491cf10052dde65d8
parent 44e3fe99c5bcf31a6d8ac953ea12b134daa2eca8
author Alex Sakhartchouk <alexst@google.com> 1331656282 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1331656282 -0700

Merge "Using the rs API instead."