OSDN Git Service

Merge "Collect status on uncrypt time cost" am: bc19e00d35
authorTianjie Xu <xunchang@google.com>
Fri, 16 Sep 2016 18:36:20 +0000 (18:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 16 Sep 2016 18:36:20 +0000 (18:36 +0000)
commit1579ce8a1d57a21ee41fd8c4d5ce79ebe194a6f5
tree19a4a5327848b065c1723f343504951cbd18006c
parent7aafc81c2e07262e77ac5108407403bc4a522f96
parent79d27bdeacfa1e25ca2f4fa727c731ac15bd1cde
Merge "Collect status on uncrypt time cost" am: bc19e00d35
am: 79d27bdeac

Change-Id: I64f13dbe40845eecb584c0f45a169e0c948275ab