tree e204e60894db20e8868535b28fb75f991fc1bb26
parent 80b1663937462d8ade4eb0187325fb01cc77df3f
parent f64cca905c45fcc74aacf78e6510e133385110cf
author Jason Sams <jsams@google.com> 1366402195 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1366402195 +0000

Merge "Updating API based on feedback" into jb-mr2-dev