tree f6c79b187f256bf9d7b4f3647055a97880259027
parent b2d295636956fe238915f7d1d6ab2aa42f4e9c2c
parent df5f870d989bd1f3c94466adace1e3879d77178e
author Jeff Sharkey <jsharkey@google.com> 1446245153 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1446245153 +0000

Merge "resolve merge conflicts of 07c6628d68 to master."