tree 29972c94eeb0901452118b0ff3346074cd833091
parent ecd14a3db433003d835a33cb1f9c5624904ab5fa
parent ee8caea24b3ac28f1074cebdaef43708a91538a7
author Tsu Chiang Chuang <tsu@google.com> 1312662926 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1312662926 -0700

Merge "changing test to use hidden test api annotations."