| commit | 3c58bbaac004ccb016bc7ecb978fffac1aa43da8 | [log] [tgz] |
|---|---|---|
| author | Guang Zhu <guangzhu@google.com> | Wed Dec 05 19:17:37 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 05 19:17:37 2012 -0800 |
| tree | 5011aff3b99c22293b906f98e5cdd685fdd5bb12 | |
| parent | d0c2fa69ef25c2a36bac0a056b284befe5807f7e [diff] | |
| parent | f89fade953157fc2f9901538c78cd03cccc2953f [diff] |
am 720f95b6: am b64737f2: (-s ours) am b00e7012: DO NOT MERGE: Add proper @hide\'s for mismatched released APIs * commit '720f95b64533b88ca6f53ec89c8b7a9fe936af42': DO NOT MERGE: Add proper @hide's for mismatched released APIs