| commit | 463339f195b2e1bb649c0420af3f50715bb7206e | [log] [tgz] |
|---|---|---|
| author | Tadashi G. Takaoka <takaoka@google.com> | Mon Aug 11 19:34:23 2014 +0900 |
| committer | Tadashi G. Takaoka <takaoka@google.com> | Mon Aug 11 19:34:23 2014 +0900 |
| tree | 9c998a3d500d08d376f53c56af11595050f2a491 | |
| parent | e5e1e7001556fec3fe8b7303e5ab802cd3fd402e [diff] | |
| parent | aca5785a3dde5541a3c30508976136792f2986a5 [diff] |
resolved conflicts for merge of aca5785a to master Change-Id: I01e8af21d6d019859da4a05995e77701a0d9c585