diff options
author | Yorke Lee <yorkelee@google.com> | 2014-11-17 14:38:59 -0800 |
---|---|---|
committer | Yorke Lee <yorkelee@google.com> | 2014-11-17 14:38:59 -0800 |
commit | db49e19578325a4bb316c342e0fa4266aa7def01 (patch) | |
tree | 17e720ef062e6010a6d08b74716fc125029f9eda /res | |
parent | 0274a22bd9c8fd6037c6a251174dd92ddeada016 (diff) | |
parent | 59edcfbc09e00712cf0da3692e93497c99c8dbbc (diff) |
Merge commit '59edcfbc' into manualmerge
Change-Id: I0d26d0510edf5ea49d77d8c3c7ecd657b5989d52
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions