| commit | 720f95b64533b88ca6f53ec89c8b7a9fe936af42 | [log] [tgz] |
|---|---|---|
| author | Guang Zhu <guangzhu@google.com> | Wed Dec 05 19:15:16 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 05 19:15:16 2012 -0800 |
| tree | 626b15433489de2e5588448ef492442a6d54c640 | |
| parent | 43261fa64275ebae7d30ebdfbc1e8db7680aa010 [diff] | |
| parent | b64737f2a2efe0868c12111959007c0147c56588 [diff] |
am b64737f2: (-s ours) am b00e7012: DO NOT MERGE: Add proper @hide\'s for mismatched released APIs * commit 'b64737f2a2efe0868c12111959007c0147c56588': DO NOT MERGE: Add proper @hide's for mismatched released APIs