| commit | 9ac406743c9754ce25f350390f11d902a51dc3bb | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Mon Oct 27 05:38:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 27 05:38:15 2014 +0000 |
| tree | ccddd3b000e236c31c1d14c35b09a933c8601119 | |
| parent | 87cd7c84f69bad5dc2aa522013cb23c7a11f7d9c [diff] | |
| parent | bec0c0c3e5fd13da68400a965c52a791853150d4 [diff] |
am bec0c0c3: am 65e04e1e: Merge "Track change to bouncycastle" * commit 'bec0c0c3e5fd13da68400a965c52a791853150d4':