tree 79b81e46267281cf12de4d4f4d69229a379cdc3d
parent 6fce50e4c6139d81558801189b59cfef905dc888
parent 649723cfb3d73af16dd02462725700897ca60e38
author Winson Chung <winsonc@google.com> 1310074836 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1310074836 -0700

Merge "Updating assets."