diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-09-26 12:54:41 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-09-26 14:58:53 -0700 |
| commit | 8760f8e3d9806a940d759c9e12fff7eb7130b9ab (patch) | |
| tree | 3471f2a1dd633efdda95765f905ff2f3d4455175 /crypto | |
| parent | 734bcf32c23442e81891641ae05e08108a4010d5 (diff) | |
| parent | 4055d6b56ac1de5b900ce6f0b484996aa357ee66 (diff) | |
Merge remote-tracking branch 'common/android-4.4' into android-4.4.y
Change-Id: I6c4e7f9f47392d4b334f71e2b20f2ccf33827632
Diffstat (limited to 'crypto')
0 files changed, 0 insertions, 0 deletions