tree a8647c859f107992f6d719029e408b99212a3c97
parent 82ad9e320aab49a25b66d01cba4e78e673cd5f6f
parent 51d669984f4a4c721ed1519cca838f0dc29258c6
author Geremy Condra <gcondra@google.com> 1362436116 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1362436116 +0000

Merge "Merge commit '6425eaad' into manualmerge" into jb-mr1-dev-plus-aosp