tree 3c47f9c233d06090025e867d77de6f93873edfe1
parent fee89ba683d594140db7d38abb340deb8e2e239d
parent 980569f04a36cc492e61c357a1c06d2386b0586f
author Ching Tzung Lin <ctlin@google.com> 1437770909 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1437770909 +0000

Merge "Fix compilation error on emerald-dev" into cw-e-dev