| commit | 3d3e43b0e4e0d7709f88f53efa37e25403992e91 | [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 | 76af9d62d0ae2ac5fc5d0e5459f1cb18e4ff5e0f | |
| parent | 54a98f5d1a86a646d5471954a0577b71e31def0d [diff] | |
| parent | 720f95b64533b88ca6f53ec89c8b7a9fe936af42 [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