tree b2a0c0a27187eb7ec0cf12b63c7b101b061b39fb
parent 06b3293d5af3454a39681cfd659271551354b8a0
parent 501c5d48c9b61bd981c809dacb63d06e666adc8c
author Ying Wang <wangying@google.com> 1346360331 -0700
committer Ying Wang <wangying@google.com> 1346360331 -0700

Merge commit '501c5d48' into manualmerge

Conflicts:
	Android.mk

Change-Id: If0a6b6475ac908a22ece23d43d1011f8d20ceb43