tree 0c5602b8dbc76e70f02f15bc267578a2cf8ae65d
parent c974ac11f808968648d26e83a0b64a7fba02ad15
parent bbd2ac5adf889e9562f0882fb35cadfcbfead740
author Bart Sears <bsears@google.com> 1425515707 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1425515708 +0000

Merge "Merge commit '83a63bac' into manualmerge" into lmp-mr1-dev