tree 43ed8224d9162aa014f865a2fb474d843c544763
parent 3d45805a0574ab6564ce785b9d129d71510a4381
author Jan-Felix Schmakeit <jfschmakeit@google.com> 1390968292 +1100
committer Hak Matsuda <hakuro@google.com> 1391112187 -0800

cherry-picked fd064c4a176ade160a49965254ce8e69ff826da5 and fixed a conflict

Change-Id: I71968a3d6c8ea979735780e3d538a8b90be05522