commit 0c9577008083f5ee8b66837e4f01471aaf207448
author Dianne Hackborn <hackbod@google.com> Tue Jul 07 00:33:16 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 07 00:33:16 2015 +0000
tree 8713bd594d0592c11d3dd5e76277fd257316b4bd
parent 8b4335f363bbd395f3cf29c321612ad7b4df7464
parent 7a90c536310796426f9f8be16265db2803bfd74b

am 7a90c536: am bcbf4641: am 569984f2: am d178b2da: am 5c8498db: Merge "Add easy way to get device idle whitelist." into mnc-dev

* commit '7a90c536310796426f9f8be16265db2803bfd74b':
  Add easy way to get device idle whitelist.
  Don't prevent windows from drawing when they are just moving
  Added support for mid-call enabled SRVCC conference call
  MWI,phantom call,Suppl services, error codes
  Rename VoLTE/WFC enable API to available - add VT available API.
  Avoid IllegalStateException when generating/importing keys.
  docs: Updated M Preview API Overview and Behavior Changes for Preview 2 release.
  Unhide signal strength constants used by getLevel.