tree 409188c7460355143b2f31c676d3d30f136d12c7
parent 5857860f5dae1ebf9bcb808b5f76590c6a027c27
parent fb0a934ad90f1855787563eb80f2c8fff7f640ac
author Chiao Cheng <chiaocheng@google.com> 1379192386 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1379192387 +0000

Merge "Follow up on build break to fix unit tests." into klp-dev