tree d134a4eeedb8c9c193b4aab74629510a2181fcb1
parent 3aad4f28376698c0dce78a7d08af4a616c3d5c04
parent 5176c974f1d9af833b7584e895fcba61e6e7427a
author ztenghui <ztenghui@google.com> 1391465933 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1391465934 +0000

Merge "Fixing a bad bug when there is no real umbra"