tree c0168e32e48e43244656be1bee032349fc36a05a
parent a278bef2fecad31848dffed00facd720789dd396
parent 082ac40439b1520c79bd985057cddfa6dbec4c90
author Jerry Zhang <zhangjerry@google.com> 1487109405 +0000
committer android-build-merger <android-build-merger@google.com> 1487109405 +0000

Merge changes from topic 'adb_perf' am: 42aa9a1415 am: a028b94b4b
am: 082ac40439

Change-Id: I25e052d39b54b575efec8f9db198410ca3f17968