tree ff967d1c3ce858473a514ee645127aad6665c6ad
parent 4aacf93d40b4be82aa35bf164d6fd6536c8b2a50
parent 17fec32bba9da8df2062b52e414435574652ad50
author Jason Sams <jsams@google.com> 1347081952 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1347134737 -0700

Merge "Fix doc typo." into jb-mr1-dev