tree 681951cab58a5e3a90828ee33357e679f776aa29
parent affc150dc44fab1911775a49636d0ce85333b634
author Shih-wei Liao <sliao@google.com> 1342475407 -0700
committer Shih-wei Liao <sliao@google.com> 1342475407 -0700

Apply changes after migration to upstream.

Change-Id: I238ddc9d9461402d15509bdacba7fee22ebf900b