| commit | 3c5f84bbde5ad777f130bb92d6dcf8c602e6d05e | [log] [tgz] |
|---|---|---|
| author | Ta-wei Yen <twyen@google.com> | Mon Nov 21 14:48:24 2016 -0800 |
| committer | Ta-wei Yen <twyen@google.com> | Tue Nov 22 00:01:10 2016 +0000 |
| tree | 5b40b60e394b2996754311007d78e6face13595d | |
| parent | 2cfe8bec9b7ec2682578912e064745586999b1c4 [diff] | |
| parent | 4ce8956d8836b664aa844ead396f5952c2098ae9 [diff] |
Merge commit '4ce8956d8836b664aa844ead396f5952c2098ae9' into manual_merge_4ce8956 Merging from https://android-review.googlesource.com/#/c/303562/ Test: merge Change-Id: I0c88fd9a65b404b3aa55924d0164ffb128d4c59e Merged-In: I0c88fd9a65b404b3aa55924d0164ffb128d4c59e