commit | 9aa370018b8c4b87450bc52a85d50ac1e6827815 | [log] [tgz] |
---|---|---|
author | Jan-Felix Schmakeit <jfschmakeit@google.com> | Wed Jan 29 15:04:52 2014 +1100 |
committer | Hak Matsuda <hakuro@google.com> | Thu Jan 30 12:03:07 2014 -0800 |
tree | 43ed8224d9162aa014f865a2fb474d843c544763 | |
parent | 3d45805a0574ab6564ce785b9d129d71510a4381 [diff] |
cherry-picked fd064c4a176ade160a49965254ce8e69ff826da5 and fixed a conflict Change-Id: I71968a3d6c8ea979735780e3d538a8b90be05522