am be4536d2: Merge "Adding matching @deprecated."

* commit 'be4536d214eedc3d12b50f0f30b47bba773b8dbc':
  Adding matching @deprecated.
This commit is contained in:
Ian Rogers
2013-04-23 09:15:58 -07:00
committed by Android Git Automerger
2 changed files with 2 additions and 1 deletions

View File

@@ -16949,7 +16949,7 @@ package android.os {
method public static void startMethodTracing(java.lang.String, int);
method public static void startMethodTracing(java.lang.String, int, int);
method public static void startNativeTracing();
method public static void stopAllocCounting();
method public static deprecated void stopAllocCounting();
method public static void stopMethodTracing();
method public static void stopNativeTracing();
method public static long threadCpuTimeNanos();

View File

@@ -577,6 +577,7 @@ href="{@docRoot}guide/developing/tools/traceview.html">Traceview: A Graphical Lo
*
* @see #startAllocCounting()
*/
@Deprecated
public static void stopAllocCounting() {
VMDebug.stopAllocCounting();
}