| commit | ad42c9e905306982a0c38c32088da20e69fa200e | [log] [tgz] |
|---|---|---|
| author | Ji-Hwan Lee <jihwan@google.com> | Mon Jun 23 15:40:08 2014 +0900 |
| committer | Ji-Hwan Lee <jihwan@google.com> | Mon Jun 23 15:40:08 2014 +0900 |
| tree | 08b38f9420a78ebcdf7318569ba9c74efc90f860 | |
| parent | 73d0a3759a97d0c242a0448957d344de9c412c47 [diff] |
Proper resolution of conflict for 8062092a Bug: 15793651 Change-Id: Ib618a9eb179dae3e2284eb8cf19a2b9216345708