commit | 8e81112b8b38d9294a56587b85e08205ad15ef90 | [log] [tgz] |
---|---|---|
author | Ching Tzung Lin <ctlin@google.com> | Fri Jul 24 20:48:29 2015 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jul 24 20:48:29 2015 +0000 |
tree | 3c47f9c233d06090025e867d77de6f93873edfe1 | |
parent | fee89ba683d594140db7d38abb340deb8e2e239d [diff] | |
parent | 980569f04a36cc492e61c357a1c06d2386b0586f [diff] |
Merge "Fix compilation error on emerald-dev" into cw-e-dev