| commit | fd71ddfd4378de331e231fbe22beb92f1efcd196 | [log] [tgz] |
|---|---|---|
| author | Tim Murray <timmurray@google.com> | Mon Feb 03 22:45:26 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Feb 03 22:45:26 2014 +0000 |
| tree | c0f91aa7d734eae6f063eb2b57e04c40c538e454 | |
| parent | 5d331c7c89d2ae7254c06f188cd02f91cd467f45 [diff] | |
| parent | 6ceac9f099b0ef7ca29351bbefa128df8101b5c2 [diff] |
am 6ceac9f0: (-s ours) am f5294ed5: (-s ours) Merge "DO NOT MERGE: Mark new util type functions as @hide in AOSP." * commit '6ceac9f099b0ef7ca29351bbefa128df8101b5c2': DO NOT MERGE: Mark new util type functions as @hide in AOSP.