am b96a6916: Merge "Fix issue android-app doc, bump battery stats checkin version" into lmp-mr1-dev

* commit 'b96a6916f657c4b3f5da7a5d2d8d32dee4d6167c':
  Fix issue android-app doc, bump battery stats checkin version

core/java/android/content/Intent.java

@@ -3949,10 +3949,12 @@ public class Intent implements Parcelable, Cloneable {
      * is:
      *
      * <pre class="prettyprint">
-     * android-app://{package_id}/{scheme}/{host}/{path}{#Intent;...}</pre>
+     * android-app://{package_id}[/{scheme}[/{host}[/{path}]]][#Intent;{...}]</pre>
      *
-     * <p>In this scheme, only the <code>pacakge_id</code> is required, and all
-     * other components can be included as desired.  Note that this can not be
+     * <p>In this scheme, only the <code>package_id</code> is required.  If you include a host,
+     * you must also include a scheme; including a path also requires both a host and a scheme.
+     * The final #Intent; fragment can be used without a scheme, host, or path.
+     * Note that this can not be
      * used with intents that have a {@link #setSelector}, since the base intent
      * will always have an explicit package name.</p>
      *

core/java/android/os/BatteryStats.java

@@ -4083,7 +4083,7 @@ public abstract class BatteryStats implements Parcelable {
         prepareForDumpLocked();
 
         dumpLine(pw, 0 /* uid */, "i" /* category */, VERSION_DATA,
-                "11", getParcelVersion(), getStartPlatformVersion(), getEndPlatformVersion());
+                "12", getParcelVersion(), getStartPlatformVersion(), getEndPlatformVersion());
 
         long now = getHistoryBaseTime() + SystemClock.elapsedRealtime();