tree 7dc80625e562c1a77a117e8eefa2d48327c4e629
parent aa05ac49db5c2a50baafedb816a404428cf6c482
parent b6c2e6b60cd9c01b853b31c29ad1c7ebbcfe2f5a
author Chad Jones <chadj@google.com> 1366714297 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366714297 -0700

am b6c2e6b6: Merge commit \'3359ffe4\' into jb-mr2-dev

* commit 'b6c2e6b60cd9c01b853b31c29ad1c7ebbcfe2f5a':