"KRS11"
am 93351ede: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit '93351edefa033cade3c8f06729a1b2a73f70e18b':
  "JSS09"
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

Change-Id: I5a556ab5d8ad80eb8bbff59784ea6bd1c23f7448
am 9d80f708: am a3d60ae8: Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev

* commit '9d80f7085707abd8f088c4f0c4d66cd666a6feb0':
  Revert "Remove mediarouter v7 support library from SDK."
am 4d9f13dd: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

* commit '4d9f13dd0fcefad9ce2e27f3b48bc0e4ba3fb9b1':
  "JSS09B"
  JWR66U
am 7c8042a3: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit '7c8042a39858bc42e3eb5ede616acbee7e8a3f06':
  "JSS10"
am d8d0c17e: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

* commit 'd8d0c17e22f42597497e8f9f5c134621e399e22a':
  "JSS11"
  "JWR66V"
Merge "Include ping6 in all device builds"
"KRS11B"
"KRS11C"
"JSS11B"
JSS11C
am cbeb6e81: Merge "Include ping6 in all device builds"

* commit 'cbeb6e81fe8faaa1c138ebe213d2b6e7fb0ad251':
  Include ping6 in all device builds
am a1b948af: am cbeb6e81: Merge "Include ping6 in all device builds"

* commit 'a1b948afdb5a46e168cf59ea4045b63722ee8b47':
  Include ping6 in all device builds
am 032ad054: am a1b948af: am cbeb6e81: Merge "Include ping6 in all device builds"

* commit '032ad0542b395d1277b634b1243f36ae2100eb16':
  Include ping6 in all device builds
core: don't hardcode "out" during findleaves.py invocations.

"out" can be $OUT_DIR

Bug: 7183057
Change-Id: I7b52d40de4398f481e47f6d6d719fb550d874f73
"JSS11D"
use ext4 instead of yaffs for the emulator

Bug: https://code.google.com/p/android/issues/detail?id=38561
Change-Id: I7c605457b485d169654263caf55eb7d5a9a60c2e
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I5f92acba878b1d0f149df1499cc09f3cda23f7e3
am 76be17de: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit '76be17de7a7fc811da0145252855802d06d55367':
  "JSS11D"
  JSS11C
  "JSS11B"