| commit | c09c80513a4e141761718d61da378412cd27eef7 | [log] [tgz] |
|---|---|---|
| author | Raymond Chiu <[email protected]> | Mon Feb 09 17:09:24 2015 -0800 |
| committer | Raymond Chiu <[email protected]> | Mon Feb 09 17:09:24 2015 -0800 |
| tree | 60dca363741789d5f4e5069a4276db3b08145443 | |
| parent | 33100ccca552bbed30f9878c03a3e92dfe833a02 [diff] | |
| parent | 3709cca4f4ce39a1bdebc117450f5919bb97681b [diff] |
resolve merge conflicts of 3709cca to studio-1.2-dev. Change-Id: If6e05cebdc2d42952b18551d48bc8599401b0d1d