am 64f2fc34: (-s ours) am fa3fce92: (-s ours) am 7dece61e: am fbb2b119: SDK: Build/Platform-tools revision 17. DO NOT MERGE.
* commit '64f2fc34e889ab2bc3aea884e35144fd3c47cefb': SDK: Build/Platform-tools revision 17. DO NOT MERGE.
This commit is contained in: