tree 08b38f9420a78ebcdf7318569ba9c74efc90f860
parent 73d0a3759a97d0c242a0448957d344de9c412c47
author Ji-Hwan Lee <jihwan@google.com> 1403505608 +0900
committer Ji-Hwan Lee <jihwan@google.com> 1403505608 +0900

Proper resolution of conflict for 8062092a

Bug: 15793651
Change-Id: Ib618a9eb179dae3e2284eb8cf19a2b9216345708