commit | 152a43215143f62ee4bedda96ce73604530a6f1d | [log] [tgz] |
---|---|---|
author | Kenny Root <kroot@google.com> | Tue Apr 30 09:01:42 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 30 09:01:42 2013 -0700 |
tree | 75019f457262ba1052065b75d69cced8b3ac9ef8 | |
parent | ada3291c8d13a9c3896102932abefed155a5b3fe [diff] | |
parent | d14586e35a3df39cc3aa6aff6a54463270a5e1a7 [diff] |
am d14586e3: resolved conflicts for merge of a69af5af to jb-mr2-dev-plus-aosp * commit 'd14586e35a3df39cc3aa6aff6a54463270a5e1a7': Track change to JSSE provider