tree dd6cd70fbfba7b2293b946f3bd7139647bcb5e5d
parent 45113a7faa37747032be887ed12dd0e440524229
author Guang Zhu <guangzhu@google.com> 1277148891 -0700
committer Guang Zhu <guangzhu@google.com> 1277148891 -0700

restore emma changes overwrittern by I9174f843

Change-Id: Ic5199ddfdaa2f8366bda960be84464945726e2f5